opdavies/dotfiles
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

refactor(git): sort aliases

Browse source
This commit is contained in:
Oliver Davies 2021-11-10 10:57:43 +00:00
parent 1a16f326ea
commit 8912b1885a
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
git/.gitconfig
View file

@ -7,6 +7,7 @@
ca = commit --amend --verbose ca = commit --amend --verbose
car = commit --amend --no-edit car = commit --amend --no-edit
cl = !hub clone cl = !hub clone
cl = !hub clone
co = checkout co = checkout
compare = !hub compare compare = !hub compare
current-branch = rev-parse --abbrev-ref HEAD current-branch = rev-parse --abbrev-ref HEAD
@ -26,13 +27,13 @@
rdup = !git dup && git rebase develop rdup = !git dup && git rebase develop
remotes = remote -v remotes = remote -v
repush = !git pull --rebase && git push repush = !git pull --rebase && git push
rmup = !git mup && git master-to-main-wrapper rebase %BRANCH%
ri = rebase --interactive ri = rebase --interactive
rid = !git rebase -i $(git merge-base develop HEAD) rid = !git rebase -i $(git merge-base develop HEAD)
rim = !git rebase -i $(git master-to-main-wrapper merge-base %BRANCH% HEAD) rim = !git rebase -i $(git master-to-main-wrapper merge-base %BRANCH% HEAD)
rip = !git rebase -i $(git merge-base production HEAD) rip = !git rebase -i $(git merge-base production HEAD)
ris = !git rebase -i $(git merge-base staging HEAD) ris = !git rebase -i $(git merge-base staging HEAD)
riu = !git rebase -i $(git rev-parse --abbrev-ref --symbolic-full-name @{u}) riu = !git rebase -i $(git rev-parse --abbrev-ref --symbolic-full-name @{u})
rmup = !git mup && git master-to-main-wrapper rebase %BRANCH%
sl = log --oneline --decorate -20 sl = log --oneline --decorate -20
sla = log --oneline --decorate --graph --all -20 sla = log --oneline --decorate --graph --all -20
slap = log --oneline --decorate --graph --all slap = log --oneline --decorate --graph --all
@ -44,7 +45,6 @@
upstream = rev-parse --abbrev-ref --symbolic-full-name @{u} upstream = rev-parse --abbrev-ref --symbolic-full-name @{u}
ureset = !git reset --hard $(git upstream) ureset = !git reset --hard $(git upstream)
wip = !git add . && git commit -m 'wip' wip = !git add . && git commit -m 'wip'
cl = !hub clone
[branch] [branch]
autosetupmerge = true autosetupmerge = true