summaryrefslogtreecommitdiffstats
path: root/.gitconfig
diff options
context:
space:
mode:
Diffstat (limited to '.gitconfig')
-rw-r--r--.gitconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitconfig b/.gitconfig
index 8c9d9c0..22b054f 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -22,6 +22,7 @@
ours = "!f() { git checkout --ours $@ && git add $@; }; f"
theirs = "!f() { git checkout --theirs $@ && git add $@; }; f"
p = push --follow-tags
+ dw = diff --color-words
[merge]
tool = vimdiff
conflictstyle = diff3