From 5cb957748ec70ea3886799633a0ef28461d66be0 Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Thu, 28 Jan 2016 16:31:47 +0100 Subject: misc Signed-off-by: Florian Pritz --- .gitconfig | 1 + 1 file changed, 1 insertion(+) (limited to '.gitconfig') 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 -- cgit v1.2.3-24-g4f1b