config/git: update some upstream-related aliases
This commit is contained in:
parent
5e078ea8b9
commit
3ded9c6793
|
@ -124,6 +124,7 @@
|
||||||
rb = rebase
|
rb = rebase
|
||||||
rbi = rebase --interactive
|
rbi = rebase --interactive
|
||||||
rbc = rebase --continue
|
rbc = rebase --continue
|
||||||
|
rbu = rebase @{upstream}
|
||||||
rbm = !git rebase $(git main)
|
rbm = !git rebase $(git main)
|
||||||
|
|
||||||
sta = stash
|
sta = stash
|
||||||
|
@ -134,21 +135,22 @@
|
||||||
|
|
||||||
rh = reset HEAD~
|
rh = reset HEAD~
|
||||||
rs = reset --keep
|
rs = reset --keep
|
||||||
ru = reset --keep @{upstream}
|
rsu = reset --keep @{upstream}
|
||||||
unstage = restore --staged --
|
unstage = restore --staged --
|
||||||
recover = restore --worktree --staged --
|
recover = restore --worktree --staged --
|
||||||
|
|
||||||
format-head = !git stash && git-clang-format HEAD~ && git commit -a --amend --no-edit && git stash pop
|
format-head = !git stash && git-clang-format HEAD~ && git commit -a --amend --no-edit && git stash pop
|
||||||
|
|
||||||
|
sun = submodule update --no-fetch
|
||||||
# Update from remote
|
# Update from remote
|
||||||
|
su = submodule update --init --recursive
|
||||||
|
|
||||||
f = fetch
|
f = fetch
|
||||||
fa = fetch --all
|
fa = fetch --all
|
||||||
fs = !git fetch && git st
|
fs = !git fetch && git st
|
||||||
lu = !git pull upstream ${1:-$(git curbranch)}
|
lu = !git pull upstream ${1:-$(git curbranch)}
|
||||||
|
|
||||||
rg = rmgonebranches
|
rg = rmgonebranches
|
||||||
su = submodule update --init --recursive
|
|
||||||
sun = submodule update --no-fetch
|
|
||||||
gcr = !git gc && git repack -a -d
|
gcr = !git gc && git repack -a -d
|
||||||
|
|
||||||
# Change remote
|
# Change remote
|
||||||
|
|
Loading…
Reference in New Issue