|
|
@@ -34,13 +34,13 @@
|
|
|
p = push
|
|
|
pf = push --force-with-lease
|
|
|
# history fast-forward (to push)
|
|
|
- hf = merge --ff-only @{push}
|
|
|
+ hff = merge --ff-only @{push}
|
|
|
# history reset hard (to push)
|
|
|
hrh = reset --hard @{push}
|
|
|
# head's history fast-forward (works even if a different branch is checked out)
|
|
|
- hhf = "!git push . $(git head)@{upstream}:$(git head)"
|
|
|
+ hhff = "!git push . $(git head)@{upstream}:$(git head)"
|
|
|
# head's history reset hard
|
|
|
- hhrh = hfh --force
|
|
|
+ hhrh = hhf --force
|
|
|
# rebase upstream
|
|
|
ru = rebase @{upstream}
|
|
|
# rebase interactive upstream
|
