Disable fast-forward merging.

2015-09-09 13:32:20 +01:00 · 2015-09-09 13:32:20 +01:00 · 813b8d65f6
parent 23fbe67379
commit 813b8d65f6
1 changed files with 2 additions and 0 deletions
--- a/.gitconfig
+++ b/.gitconfig
@ -25,3 +25,5 @@
    ui = true
 [branch]
    autosetuprebase = always
+[merge]
+	ff = false