jdkaplan/dotfiles
1
0
Fork 0
Code Activity

Fix incorrectly global git merge config

Browse source
This commit is contained in:
Jeremy Kaplan 2015-11-20 23:03:15 -05:00
commit 25ea85f5a1
1 changed files with 0 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
git/config
View file

@ -7,7 +7,5 @@
default = simple default = simple
[alias] [alias]
lg = log --oneline --graph --decorate lg = log --oneline --graph --decorate
[merge]
ff = false
[credential] [credential]
helper = cache helper = cache