change merge default

Machyne · Dec 1, 2015 · 7445a6f · 7445a6f
1 parent a3e0092
commit 7445a6f
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/git/gitconfig b/git/gitconfig
@@ -12,7 +12,7 @@
         pl = pull --rebase
         ri = rebase -i
         rv = remote -v
-        mf = merge --ff-only
+        mnof = merge --no-ff
 
 [push]
         default = current
@@ -29,10 +29,13 @@
 [rerere]
         enabled = 1
 
+[merge]
+        ff=only
+
 [core]
-	editor = vim
+        editor = vim
 
 [filter "media"]
-	clean = git media clean %f
-	smudge = git media smudge %f
-	required = true
+        clean = git media clean %f
+        smudge = git media smudge %f
+        required = true