[gitconfig] don't prompt on mergetool
This commit is contained in:
parent
10a678d6f7
commit
1642e225c9
1 changed files with 2 additions and 0 deletions
|
@ -14,6 +14,8 @@
|
||||||
[diff]
|
[diff]
|
||||||
renamelimit = 65536
|
renamelimit = 65536
|
||||||
renames = copies
|
renames = copies
|
||||||
|
[difftool]
|
||||||
|
prompt = false
|
||||||
[gitflow "prefix"]
|
[gitflow "prefix"]
|
||||||
feature = dev/
|
feature = dev/
|
||||||
versiontag = v
|
versiontag = v
|
||||||
|
|
Loading…
Reference in a new issue