|
@@ -49,6 +49,8 @@
|
|
|
riu = rebase -i @{upstream}
|
|
riu = rebase -i @{upstream}
|
|
|
# rebase interactive autosquash upstream
|
|
# rebase interactive autosquash upstream
|
|
|
riau = rebase -i --autosquash @{upstream}
|
|
riau = rebase -i --autosquash @{upstream}
|
|
|
|
|
+ # diff the rebase
|
|
|
|
|
+ dr = range-diff @{u} @{1} @
|
|
|
ca = commit --amend
|
|
ca = commit --amend
|
|
|
smash = "!git add -u && git ca --no-edit && git pf"
|
|
smash = "!git add -u && git ca --no-edit && git pf"
|
|
|
reset-head = remote set-head origin -a
|
|
reset-head = remote set-head origin -a
|
