disable git merge fast forwarding

indiebrain · Jul 9, 2012 · 05c66cf · 05c66cf
1 parent 2b3f5b5
commit 05c66cf
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/.gitconfig b/.gitconfig
@@ -11,4 +11,6 @@
 	cb  = checkout -b
 	crb = checkout --track -b
 	db  = branch -d
-	rclone = clone --recursive
+	rclone = clone --recursive
+[merge]
+	ff = flase