barak/dotfiles
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

update

Browse source
This commit is contained in:
Barak Michener 2016-05-13 17:05:59 -07:00
parent 0cf03d25d8
commit 924ec15b2a
4 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitconfig
View file

@ -15,6 +15,7 @@
submodule-pull = submodule foreach git pull
ours = "!f() { git checkout --ours $@ && git add $@; }; f"
theirs = "!f() { git checkout --theirs $@ && git add $@; }; f"
praise = blame
[diff]
renamelimit = 0