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