jujutsu: Add initial configuration
This commit is contained in:
parent
72b1a2f0ea
commit
768ffe028f
1 changed files with 25 additions and 0 deletions
25
jujutsu/.config/jj/config.toml
Normal file
25
jujutsu/.config/jj/config.toml
Normal file
|
@ -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"
|
Loading…
Reference in a new issue