From d422173a56cc205e2c16df3d811876db3fc6039d Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Fri, 19 Aug 2016 13:57:31 +0200 Subject: misc Signed-off-by: Florian Pritz --- .gitconfig | 1 + 1 file changed, 1 insertion(+) (limited to '.gitconfig') diff --git a/.gitconfig b/.gitconfig index 6e2b555..bb1db9c 100644 --- a/.gitconfig +++ b/.gitconfig @@ -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 -- cgit v1.2.3-24-g4f1b