20 lines
485 B
Cheetah
20 lines
485 B
Cheetah
[user]
|
|
email = {{ .email | quote }}
|
|
name = {{ .name | quote }}
|
|
|
|
[ui]
|
|
conflict_style = "git"
|
|
diff-formatter = ["difft", "--color=always", "$left", "$right"]
|
|
diff-editor = "meld"
|
|
merge-editor = ["meld", "$left", "$base", "$right", "-o", "$output"]
|
|
|
|
[merge-tools.meld]
|
|
program = "meld" # Defaults to the name of the tool if not specified
|
|
edit-args = ["--newtab", "$left", "$right"]
|
|
|
|
# [signing]
|
|
# behavior = "own"
|
|
# backend = "gpg"
|
|
|
|
[remotes.origin]
|
|
auto-track-bookmarks = "glob:*"
|