diff --git a/gitconfig b/gitconfig index 5e8ec3f..35613b9 100644 --- a/gitconfig +++ b/gitconfig @@ -20,6 +20,7 @@ f = fetch fixup = rebase -i --autosquash fixom = rebase -i --autosquash origin/master + l = log mr = !git merge $(git rb) nb = checkout -b nuke = reset --hard @@ -29,13 +30,16 @@ plr = pull --rebase pr = diff origin/master prs = diff --stat origin/master + ra = rebase --abort rb = !git rev-parse --abbrev-ref --symbolic-full-name @{u} rc = rebase --continue + re = rebase rom = rebase origin/master rr = !git reset --hard $(git rb) shp = show -p s = status sq = merge --squash + sshp = stash show -p ss = stash save st = status undo = reset --soft HEAD^