mirror of
https://source.perfectable.org/nivertius/git-rc.git
synced 2025-07-02 02:15:47 +02:00
Make merge-commits require command-line argument
This commit is contained in:
parent
9d8158154b
commit
b95da100d8
1 changed files with 2 additions and 0 deletions
|
@ -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"]
|
||||||
|
|
Loading…
Add table
Reference in a new issue