Make merge-commits require command-line argument

This commit is contained in:
Paweł Płazieński 2018-12-21 20:51:33 +01:00
parent 9d8158154b
commit b95da100d8

View file

@ -57,6 +57,8 @@
abbreviateCommands = true abbreviateCommands = true
[commit] [commit]
verbose = true verbose = true
[merge]
ff = only
[mergetool] [mergetool]
keepBackup = false keepBackup = false
[color "diff"] [color "diff"]