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 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