diff options
Diffstat (limited to '.gitconfig')
-rw-r--r-- | .gitconfig | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -19,6 +19,8 @@ mff = merge --ff-only refl = reflog --date=relative mnf = merge --no-ff + ours = "!f() { git checkout --ours $@ && git add $@; }; f" + theirs = "!f() { git checkout --theirs $@ && git add $@; }; f" [merge] tool = vimdiff conflictstyle = diff3 |