my gitconfig

.alias

alias gb='git branch'
alias gc='git commit -v'
alias gd='git diff'
alias gg='git grep -n'
alias gl='git pull'
alias gm='git merge'
alias gp='git push'
alias gr='git reset'
alias gap='git add -p'
alias gca='git commit -a -v'
alias gco='git checkout'
alias gdc='git diff --cached'
alias gdh='git diff HEAD'
alias ggi='git grep -in'
alias gpr='git pull --rebase'
alias gst='git status'
alias gsp='git stash pop'
alias glod='git log --oneline --decorate'
alias glom='git pull origin master'
alias gpom='git push origin master'
alias gstsb='git status -sb'

.gitconfig

[alias]
	st = status
	ci = commit
	co = checkout
	cp = cherry-pick
	put = push origin HEAD
	fixup = !sh -c 'git commit -m \"fixup! $(git log -1 --format='\\''%s'\\'' $@)\"' -
	squash = !sh -c 'git commit -m \"squash! $(git log -1 --format='\\''%s'\\'' $@)\"' -
	ri = rebase --interactive
	po = push origin
#[branch]
#	autosetuprebase = always
[color]
	ui = auto
[core]
	excludesfile = /Users/tracey/.gitignore
	editor = vim
	whitespace = warn
[help]
	autocorrect = 10
[merge]
	summary = true
[merge "gemfilelock"]
	name = relocks the gemfile.lock
	driver = bundle lock
[merge "bundlelock"]
	name = lock Gemfile
	driver = bundle install
[merge "bundle"]
	name = bundle
	driver = bundle
[merge "railsschema"]
	name = newer Rails schema version
	driver = "ruby -e '\n\
		system %(git), %(merge-file), %(--marker-size=%L), %(%A), %(%O), %(%B)\n\
		b = File.read(%(%A))\n\
		b.sub!(/^<+ .*\\nActiveRecord::Schema\\.define.:version => (\\d+). do\\n=+\\nActiveRecord::Schema\\.define.:version => (\\d+). do\\n>+ .*/) do\n\
		  %(ActiveRecord::Schema.define(:version => #{[$1, $2].max}) do)\n\
		end\n\
		File.open(%(%A), %(w)) {|f| f.write(b)}\n\
		exit 1 if b.include?(%(<)*%L)'"
[push]
	default = tracking
[rebase]
	autosquash = true