.gitshrc

#!/bin/bash

# Tools required:
# http://github.com/rtomayko/git-sh
# http://git-wt-commit.rubyforge.org/
#
# Aliases in .gitconfig, git builtins ("status", for example) are auto-aliased by git-sh:
#	st = status
#	co = checkout
#	ci = commit
#	br = branch
#	brs = branch -a --verbose
#	aa = add --all
#	au = add --update
#	ai = add --interactive
#	rc = rebase --continue
#	wdw = log --pretty=\"format:%an - %s\"
#	glog = log --graph --pretty=oneline --abbrev-commit --decorate --branches
#	amend = commit --amend --reuse-message=HEAD
#	dc = diff --cached
#	stashdiff = stash show -p
#	wtf = !ruby \"$(cygpath --windows --absolute ~/git-wtf.rb)\" --all --relations
#	rank = !ruby \"$(cygpath --windows --absolute ~/git-rank-contributors.rb)\" $*
#	publish = !ruby \"$(cygpath --windows --absolute ~/git-publish-branch.rb)\" $*
#	svn-relocate = !sh ~/git-svn-relocate.sh $*
#	clobber = !sh ~/git-cleanup.sh
#	sh = !sh ~/git-sh.sh
#	multi-cherry-pick = !sh ~/git-multi-cherry-pick.sh
#	dt = difftool
#	dtp = difftool --tool=p4
#	mt = mergetool
#	mtp = mergetool --tool=p4

gitalias cmd='command'

# git commit
gitalias commit='git commit --verbose'
gitalias amend='git commit --verbose --amend --reuse-message=HEAD'
gitalias ci='git commit --verbose'
gitalias ca='git commit --verbose --all'

gitalias co='git checkout'

# git branch and remote
gitalias   b='git branch'
gitalias brs='git branch -a --verbose'
gitalias  rv='git remote -v'
gitalias pru='git fetch upstream && git rebase upstream/master'
gitalias pro='git fetch origin && git rebase origin/master'
gitalias publish='git publish'
gitalias pub='git publish'
gitalias wtf='git wtf'

# git add
gitalias  a='git add'
gitalias au='git add --update'
gitalias aa='git add --all'
gitalias ai='git add --interactive'
gitalias ap='git add --patch'
gitalias aaa='git add --all && git commit --verbose --amend --reuse-message=HEAD'
gitalias aua='git add --update && git commit --verbose --amend --reuse-message=HEAD'

# git checkout
gitalias c='git checkout'

# git fetch
gitalias f='git fetch'

# rebase
gitalias  r='git rebase --interactive'
gitalias rc='git rebase --continue'
gitalias ra='git rebase --abort'

# git diff
gitalias  d='git diff'
gitalias  p='git diff --cached'   # mnemonic: "patch"
gitalias dc='git diff --cached'

gitalias dt='git difftool'
gitalias dtc='git difftool --cached'
gitalias dtp='git difftool --tool=p4'
gitalias dtcp='git difftool --cached --tool=p4'
gitalias mt='git mergetool'
gitalias mtp='git mergetool --tool=p4'

# git status
gitalias  s='git status'

# git log
gitalias ll='git log'
gitalias  l='git log --pretty=oneline --abbrev-commit --max-count=15'
gitalias glog='git glog'
gitalias gl='git glog'

# misc
gitalias pick='git cherry-pick'
gitalias multi-cherry-pick='git multi-cherry-pick'
gitalias mcp='git multi-cherry-pick'

# experimental
gitalias unstage='git reset HEAD'
gitalias pop='git reset --soft HEAD^'
gitalias review='git log -p --max-count=1'
gitalias review-files='git log --name-only --max-count=1'

# svn
gitalias sd='git svn dcommit'
gitalias sr='git svn rebase'

gitalias ui='gitk --all &'
gitalias gk='gitk --all &'