aboutsummaryrefslogtreecommitdiff
path: root/.config/git/config
diff options
context:
space:
mode:
Diffstat (limited to '.config/git/config')
-rw-r--r--.config/git/config2
1 files changed, 1 insertions, 1 deletions
diff --git a/.config/git/config b/.config/git/config
index 296caa0..63ea101 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -15,7 +15,7 @@
p = push
pa = push-all
prev = ! git show "HEAD:$1"
- r = rebase --preserve-merges -i
+ r = rebase --rebase-merges -i
ra = commit --amend --no-edit -a
rc = rebase --continue
s = status -s