git: add alias

2022-07-12 14:22:52 +02:00 · 2022-07-12 14:22:52 +02:00 · 3dc7a2810f
commit 3dc7a2810f
parent ff6664c54e
1 changed files with 2 additions and 1 deletions
--- a/.gitconfig
+++ b/.gitconfig
@ -64,8 +64,9 @@
    code-changes = "!git log --format=format: --name-only | egrep -v '^$' | sort | uniq -c | sort -rg | head -10"
    cc = "!git code-changes"
    fixup = "commit --fixup"
-    ri = "rebase -i --autostash"
+    ri = "rebase -i --autostash --autosquash"
    up = pull --rebase --autostash
+    rebaseour = "rebase -Xours"
 [branch]
    #New branch track remote
    #autosetupmerge = always