# Accumulated over the years.. thanks to Marijn Suijten for many of these
alias gpf='git push --force-with-lease'
alias gcae='git commit --allow-empty'
alias gcamr='git commit --amend --reset-author'
alias gcams='git commit --amend -s'
alias gt="git tree"
alias gtfl="git tree --format=fuller"
alias gsh="git show --format=fuller"
alias gs="git status"
alias gmc="git merge --continue"
alias gbv="git branch -v"
alias gbrv="git branch -rv"
alias gbm="git branch -m"
alias glgo="git log --oneline --stat --decorate"
alias glgf="git log --format=fuller"
alias gam="git am"
alias gama="git am --abort"
alias gamc="git am --continue"
alias gamscp="git am --show-current-patch"
alias greva="git revert --abort"
alias grevc="git revert --continue"
alias grbscp="git rebase --show-current-patch"
alias grbe="git rebase --edit-todo"
alias grbcn="git rebase --continue --no-edit"
alias gstlp="git stash list -p"
alias gcp="git cherry-pick"
alias gcps="git cherry-pick --skip"
alias gcpcn="git cherry-pick --continue --no-edit"
alias gdni="git diff --no-index"
alias gfp="git format-patch"
alias grho='git reset --hard origin/$(git_current_branch)'
alias grhk="git reset --keep"
alias pp1="patch -p1 --merge"