From 62faba9b5db29d4bc170fb7d278350786d55b76d Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Mon, 26 Oct 2015 17:08:03 +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 8a95fab..1680f55 100644 --- a/.gitconfig +++ b/.gitconfig @@ -21,6 +21,7 @@ mnf = merge --no-ff ours = "!f() { git checkout --ours $@ && git add $@; }; f" theirs = "!f() { git checkout --theirs $@ && git add $@; }; f" + p = push --follow-tags [merge] tool = vimdiff conflictstyle = diff3 -- cgit v1.2.3-24-g4f1b