sysadmin/dotfiles
1
0
Fork 0
Code Issues Pull requests 1 Activity

feat(jujutsu): add a different email address for waarp repos

Browse source
This commit is contained in:
Bruno Carlin 2025-02-11 15:23:05 +01:00
parent 51483c94de
commit 26a0c55008
Signed by: bcarlin
GPG key ID: 8E254EA0FFEB9B6D
2 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
jujutsu/.config/jj/conf.d/waarp.toml Normal file
View file

@ -0,0 +1,4 @@
--when.repositories = ["~/Progs/waarp"]
[user]
email = "bruno.carlin@waarp.org"

19
jujutsu/.config/jj/config.toml
View file

@ -10,12 +10,17 @@ editor = "nvim"
diff-editor = ["nvim", "-c", "DiffEditor $left $right $output"] diff-editor = ["nvim", "-c", "DiffEditor $left $right $output"]
merge-editor = "nvim" merge-editor = "nvim"
diff.tool = ["delta", "--syntax-theme", "Solarized (dark)", "$left", "$right"] diff.tool = ["delta", "--syntax-theme", "Solarized (dark)", "$left", "$right"]
show-cryptographic-signatures = true
[merge-tools.nvim] [merge-tools.nvim]
diff-args = ["-d", "$left", "$right"] diff-args = ["-d", "$left", "$right"]
merge-args = ["-d", "$left", "$base", "$right", "-c", "wincmd l"] merge-args = ["-d", "$left", "$output", "$right", "-c", "wincmd l"]
merge-tool-edits-conflict-markers = true merge-tool-edits-conflict-markers = true
[signing]
behavior = "own"
backend = "gpg"
[colors] [colors]
"rest" = "bright green" "rest" = "bright green"
"working_copy empty" = "green" "working_copy empty" = "green"
@ -24,5 +29,13 @@ merge-tool-edits-conflict-markers = true
"working_copy change_id" = "magenta" "working_copy change_id" = "magenta"
"working_copy timestamp" = "cyan" "working_copy timestamp" = "cyan"
[git] [templates]
subprocess = true draft_commit_description = '''
concat(
coalesce(description, "\n"),
surround(
"\nJJ: This commit contains the following changes:\n", "",
indent("JJ: ", diff.summary() ++ "\n\n" ++ diff.git()),
),
)
'''