diff --git a/jujutsu/.config/jj/config.toml b/jujutsu/.config/jj/config.toml new file mode 100644 index 0000000..d7a04a3 --- /dev/null +++ b/jujutsu/.config/jj/config.toml @@ -0,0 +1,25 @@ +[diff.git] +context = 10 + +[merge-tools.diffconflicts] +program = "nvim" +merge-args = ["-c", "JJDiffConflicts!", "$output"] +merge-tool-edits-conflict-markers = true + +[revset-aliases] +"immutable_heads()" = "present(trunk()) | tags() | (trunk().. & ~mine())" + +[signing] +sign-all = false +backend = "gpg" +key = "6F6A0609C12038F3" + +[ui] +default-command = ["log", "-r", "all()", "--limit", "15"] +diff.format = "git" +diff.tool = ["difft", "--color=always", "$left", "$right"] +editor = "nvim" + +[user] +name = "Sanchayan Maity" +email = "me@sanchayanmaity.net"