29 lines
710 B
TOML
29 lines
710 B
TOML
|
|
||
|
|
[user]
|
||
|
|
name = "Bruno Carlin"
|
||
|
|
email = "dev@mail.bcarlin.net"
|
||
|
|
|
||
|
|
[ui]
|
||
|
|
default-command = "log"
|
||
|
|
graph.style = "curved"
|
||
|
|
editor = "nvim"
|
||
|
|
diff-editor = ["nvim", "-c", "DiffEditor $left $right $output"]
|
||
|
|
merge-editor = "nvim"
|
||
|
|
diff.tool = ["delta", "--syntax-theme", "Solarized (dark)", "$left", "$right"]
|
||
|
|
|
||
|
|
[merge-tools.nvim]
|
||
|
|
diff-args = ["-d", "$left", "$right"]
|
||
|
|
merge-args = ["-d", "$left", "$base", "$right", "-c", "wincmd l"]
|
||
|
|
merge-tool-edits-conflict-markers = true
|
||
|
|
|
||
|
|
[colors]
|
||
|
|
"rest" = "bright green"
|
||
|
|
"working_copy empty" = "green"
|
||
|
|
"working_copy empty description placeholder" = "green"
|
||
|
|
"working_copy commit_id" = "blue"
|
||
|
|
"working_copy change_id" = "magenta"
|
||
|
|
"working_copy timestamp" = "cyan"
|
||
|
|
|
||
|
|
[git]
|
||
|
|
subprocess = true
|