Permalink
Browse files

The merge.ff=false, it does NOTHING!

  • Loading branch information...
1 parent 80a86c4 commit 9642041ddbffbf00e5a77ff96bfec5dcc66135ff @stash committed Mar 28, 2012
Showing with 0 additions and 2 deletions.
  1. +0 −2 gitconfig
View
@@ -15,5 +15,3 @@
ls = ls-files --exclude-standard
[format]
pretty = oneline
-[merge]
- ff = false

0 comments on commit 9642041

Please sign in to comment.