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

Add ours/theirs

Browse source
This commit is contained in:
Barak Michener 2013-04-08 11:11:57 -04:00
parent ca79c3cff7
commit c17e59bf17
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitconfig
View file

@ -13,6 +13,8 @@
sdiff = diff --staged
graph = log --graph --oneline
submodule-pull = submodule foreach git pull
ours = "!f() { git checkout --ours $@ && git add $@; }; f"
theirs = "!f() { git checkout --theirs $@ && git add $@; }; f"
[diff]
renamelimit = 0