diff options
Diffstat (limited to '.gitconfig')
-rw-r--r-- | .gitconfig | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -23,6 +23,7 @@ theirs = "!f() { git checkout --theirs $@ && git add $@; }; f" p = push --follow-tags dw = diff --color-words + ri = rebase -i --autosquash [merge] tool = kdiff3 conflictstyle = diff3 |