gitconfig: update aliases

This commit is contained in:
Rob Watson 2021-05-06 14:46:45 +02:00
parent 2d5948854d
commit c66b73d985
1 changed files with 8 additions and 5 deletions

View File

@ -4,10 +4,12 @@
[alias] [alias]
aa = add . aa = add .
adp = add -p adp = add -p
an = add -N .
bn = rev-parse --abbrev-ref HEAD bn = rev-parse --abbrev-ref HEAD
br = branch br = branch
chp = checkout -p ca = commit --amend
cf = !git commit --fixup $(git log --invert-grep --grep fixup -n1 --oneline --format=format:%h) cf = !git commit --fixup $(git log --invert-grep --grep fixup -n1 --oneline --format=format:%h)
chp = checkout -p
ci = commit ci = commit
cl = clone cl = clone
cltms = !sh -c 'cd $HOME/dev && git clone $1 && cd $(basename $1 .git) && tmuxsess' -- cltms = !sh -c 'cd $HOME/dev && git clone $1 && cd $(basename $1 .git) && tmuxsess' --
@ -18,16 +20,17 @@
dom = diff origin/master dom = diff origin/master
ds = diff --staged ds = diff --staged
f = fetch f = fetch
fixup = rebase -i --autosquash
fixom = rebase -i --autosquash origin/master fixom = rebase -i --autosquash origin/master
fixup = rebase -i --autosquash
l = log l = log
ls = !git branch --format '%(refname:short)' | fzf
mr = !git merge $(git rb) mr = !git merge $(git rb)
nb = checkout -b nb = checkout -b
nuke = reset --hard nuke = reset --hard
p = push p = push
poh = push -u origin HEAD
pl = pull pl = pull
plr = pull --rebase plr = pull --rebase
poh = push -u origin HEAD
pr = diff origin/master pr = diff origin/master
prs = diff --stat origin/master prs = diff --stat origin/master
ra = rebase --abort ra = rebase --abort
@ -36,13 +39,13 @@
re = rebase re = rebase
rom = rebase origin/master rom = rebase origin/master
rr = !git reset --hard $(git rb) rr = !git reset --hard $(git rb)
shp = show -p
s = status s = status
shp = show -p
sq = merge --squash sq = merge --squash
sshp = stash show -p
ss = stash save ss = stash save
st = status st = status
undo = reset --soft HEAD^ undo = reset --soft HEAD^
sshp = stash show -p
[user] [user]
email = rob@netflux.io email = rob@netflux.io
name = Rob Watson name = Rob Watson