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