|
|
@@ -24,6 +24,11 @@
|
|
|
lg = "log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%C(bold blue)<%an>%Creset' --abbrev-commit"
|
|
|
po = push origin
|
|
|
pof = push origin --force-with-lease
|
|
|
- rom = rebase origin/master
|
|
|
- riom = rebase -i origin/master
|
|
|
+ ff = merge --ff-only @{upstream}
|
|
|
+ roh = rebase origin/HEAD
|
|
|
+ rioh = rebase -i origin/HEAD
|
|
|
ca = commit --amend
|
|
|
+ smash = "!git add -u && git ca --no-edit && git pof"
|
|
|
+ reset-head = remote set-head origin -a
|
|
|
+ head = for-each-ref --format="%(symref:lstrip=-1)" refs/remotes/origin/HEAD
|
|
|
+ sh = "!git switch $(git head)"
|
