Useful Git aliases

.git_profile

# My Git aliases
#
# Add these by putting this file in home directory + adding the following line to .bash_profile:
# source ~/.git_profile
#
# (alternatively, just copy in whatever you want to your .bash_profile)

# Diff between where I am and master
alias gdm='git diff master...head'

# Show files in commit. E.g. gitshowfiles 1a3297d
alias gitshowfiles="git diff-tree --no-commit-id --name-only -r"

# deletes all branches that are contained in current branch (Except master / dev)
alias gitcleanbranches="git branch --no-color --merged | egrep -v \"(^\*|master|dev)\" | xargs git branch -D"

# Show info on current branch
alias ginfo='cat .git/config'

# Reset last commit
alias grh1='git reset HEAD~1'

# Adds all current changes (staged and unstaged) to previous commit
alias 'gcan!'='git commit -v -a --no-edit --amend'

# Adds all staged changes to previous commit
alias 'gca!'='git commit -v --no-edit --amend'

# Shows branches (latest updated first)
alias gb='git branch --sort=-committerdate'

# Commit all staged files to a tmp commit (no precommit hooks)
alias gtmp='git commit -m "tmp" --no-verify'

# Commit all files to a tmp commit (no precommit hooks)
alias gatmp='git commit -am "tmp" --no-verify'

# Add non-whitespace changes
alias ganowhitespace='git --no-pager diff -w --no-color | git apply --cached --ignore-whitespace'

# Push current (new) branch to origin
alias ggpush='git push --set-upstream origin $(git symbolic-ref --short HEAD)'

# Shorthand used for other aliases
alias current_branch='git symbolic-ref --short HEAD'

# Common (my most used)
alias ga='git add'
alias gc='git commit -v'
alias gco='git checkout'
alias gd='git diff'
alias gdca='git diff --cached'
alias gcp='git cherry-pick'
alias gl='git pull'
alias gp='git push'
alias glo='git log --oneline --decorate --color'
alias grb='git rebase'
alias grbi='git rebase -i'
alias grbm='git rebase master'
alias grba='git rebase --abort'
alias grbc='git rebase --continue'
alias grbs='git rebase --skip'
alias gs='git show'
alias gst='git status -s'

# Common (less used)
alias g=git
alias gaa='git add --all'
alias gau='git add -u'
alias gapa='git add --patch'
alias gba='git branch -a'
alias gbda='git branch --merged | command grep -vE "^(\*|\s*master\s*$)" | command xargs -n 1 git branch -d'
alias gbl='git blame -b -w'
alias gbnm='git branch --no-merged'
alias gbr='git branch --remote'
alias gbs='git bisect'
alias gbsb='git bisect bad'
alias gbsg='git bisect good'
alias gbsr='git bisect reset'
alias gbss='git bisect start'
alias 'gc!'='git commit -v --amend'
alias gca='git commit -v -a'
alias gcam='git commit -a -m'
alias gcb='git checkout -b'
alias gcf='git config --list'
alias gcl='git clone --recursive'
alias gclean='git clean -fd'
alias gcm='git checkout master'
alias gcmsg='git commit -m'
alias gcount='git shortlog -sn'
alias gcs='git commit -S'
alias gdct='git describe --tags `git rev-list --tags --max-count=1`'
alias gdt='git diff-tree --no-commit-id --name-only -r'
alias gdw='git diff --word-diff'
alias gf='git fetch'
alias gfa='git fetch --all --prune'
alias gfo='git fetch origin'
alias gg='git gui citool'
alias gga='git gui citool --amend'
alias ggpull='git pull origin $(current_branch)'
alias ggpur=ggu
alias ggsup='git branch --set-upstream-to=origin/$(git symbolic-ref --short HEAD)'
alias gignore='git update-index --assume-unchanged'
alias gignored='git ls-files -v | grep "^[[:lower:]]"'
alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
alias gitn='python3.4 ~/Repos/OpenwebDevutilities/scripts/gitnfr.py'
alias gitshowfiles='git diff-tree --no-commit-id --name-only -r'
alias gk='\gitk --all --branches'
alias gke='\gitk --all $(git log -g --pretty=format:%h)'
alias glg='git log --stat --color'
alias glgg='git log --graph --color'
alias glgga='git log --graph --decorate --all'
alias glgm='git log --graph --max-count=10'
alias glgp='git log --stat --color -p'
alias globurl='noglob urlglobber '
alias glog='git log --oneline --decorate --color --graph'
alias glol='git log --graph --pretty=format:'\''%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'\'' --abbrev-commit'
alias glola='git log --graph --pretty=format:'\''%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'\'' --abbrev-commit --all'
alias glp=_git_log_prettily
alias glum='git pull upstream master'
alias gm='git merge'
alias gmom='git merge origin/master'
alias gmt='git mergetool --no-prompt'
alias gmtvim='git mergetool --no-prompt --tool=vimdiff'
alias gmum='git merge upstream/master'
alias gpd='git push --dry-run'
alias gpoat='git push origin --all && git push origin --tags'
alias gpristine='git reset --hard && git clean -dfx'
alias gpu='git push upstream'
alias gpv='git push -v'
alias gr='git reset'
alias gra='git remote add'
alias grep='grep  --color=auto --exclude-dir={.bzr,CVS,.git,.hg,.svn}'
alias grh='git reset HEAD'
alias grhh='git reset HEAD --hard'
alias grmv='git remote rename'
alias grrm='git remote remove'
alias grset='git remote set-url'
alias grt='cd $(git rev-parse --show-toplevel || echo ".")'
alias gru='git reset --'
alias grup='git remote update'
alias grv='git remote -v'
alias gsb='git status -sb'
alias gsd='git svn dcommit'
alias gsi='git submodule init'
alias gsps='git show --pretty=short --show-signature'
alias gsr='git svn rebase'
alias gss='git status'
alias gsta='git stash'
alias gstaa='git stash apply'
alias gstd='git stash drop'
alias gstl='git stash list'
alias gstp='git stash pop'
alias gsts='git stash show --text'
alias gsu='git submodule update'
alias gts='git tag -s'
alias gtv='git tag | sort -V'
alias gunignore='git update-index --no-assume-unchanged'
alias gunwip='git log -n 1 | grep -q -c "\-\-wip\-\-" && git reset HEAD~1'
alias gup='git pull --rebase'
alias gupv='git pull --rebase -v'
alias gvm=sdk
alias gvt='git verify-tag'
alias gwch='git whatchanged -p --abbrev-commit --pretty=medium'
alias gwip='git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit -m "--wip--"'