[alias]
# I copied some aliases from http://gitalias.com/ and other sources.
# Some I've added to gitalias. Some are mine.

  # One letter alias for our most frequent commands.
  a = add
  b = branch
  c = commit
  d = diff
  f = fetch
  g = grep
  l = log
  m = merge
  o = checkout
  p = pull
  r = remote
  s = status
  w = whatchanged

  ### add ###

  aa = add --all

  ap = add --patch

  au = add --update

  ### branch ###

  be = branch --edit-description

  bm = branch --merged

  bnm = branch --no-merged

  ### commit ###

  cm = commit --message

  ### checkout ###

  co = checkout

  ### cherry-pick ###

  chp = cherry-pick

  ### diff ###

  # diff - show changes not yet staged
  dc = diff --cached

  # diff - changes about to be commited
  ds = diff --staged

  # diff - show changes but by word, not line
  dw = diff --word-diff

  ### rebase ###

  rb = rebase

  rba = rebase --abort

  rbc = rebase --continue

  rbs = rebase --skip

  ### remote ###

  rs = remote show

  ru = remote update

  rp = remote prune

  incoming = !git remote update --prune; git log ..@{upstream}
  outgoing = log @{upstream}..

  # Push to all remotes
  push-to-all-remotes = !git remote | xargs -I% -n1 git push %

  ### show-branch ###

  # show-branch - print a list of branches and their commits.
  sb = show-branch

  ### status ###

  ss = status --short

  ssb = status --short --branch

  aliases = !"git config --get-regexp 'alias.*' | colrm 1 6 | sed 's/[ ]/ = /'"

  add-alias = "!f() { [ $# = 3 ] && git config $1 alias.\"$2\" \"$3\" && return 0 || echo \"Usage: git add-(local|global)-alias <new alias> <original command>\" >&2 && return 1; }; f"
  add-global-alias = "!git add-alias --global"
  add-local-alias = "!git add-alias --local"

  tags = tag -n1 --list

  # Find text in any commit ever
  grep-all = !"f() { git rev-list --all | xargs git grep \"$@\"; }; f"

  # Editing and adding conflicted files: when we get many merge conflicts
  # and want to quickly solve them using an editor, then add the  files.
  edit-unmerged = !"f() { git ls-files --unmerged | cut -f2 | sort -u ; }; "${VISUAL:-${EDITOR:-vi}}" `f`"
  add-unmerged = !"f() { git ls-files --unmerged | cut -f2 | sort -u ; }; git add `f`"

  # Get the current branch name
  branch-name = rev-parse --abbrev-ref HEAD

	branches = branch --all
	ca = commit --all
	cv = commit --verbose
	cav = commit --all --verbose
	cane = commit --amend --no-edit
	checkin = commit
	ci = commit
	cat = cat-file -p
	dump = cat-file -p
	file = cat-file -t
	type = cat-file -t
	l1 = log --decorate --oneline
	l5 = log --decorate -5
	ld = log --decorate
	lg = log --decorate --graph
	lg1 = log --decorate --graph --oneline
	lg5 = log --decorate --graph -5
	lr = log --decorate --reverse
	lr1 = log --decorate --reverse --oneline
	lr5 = log --decorate --reverse -5
	null-merge = merge --strategy=ours
	rbi123 = "!f() { exec git rebase --interactive $1 $2 ${3:-\"@{upstream\\}\"}; }; f"
	rbi = !git rbi123 '' ''
	rbia = !git rbi123 --autosquash ''
	rbiap = !git rbi123 --autosquash --preserve-merges
	rbip = !git rbi123 '' --preserve-merges
	remotes = remote --verbose
	#root = !pwd
	root = rev-parse --show-toplevel
	st = status --short
	stb = status --short --branch
	sd = show --decorate
	sw = show --word-diff --decorate
	unstage = reset HEAD --

[branch]
	autosetuprebase = always

[color]
	ui = auto

[include]
	path = ~/lib/config/git/light_bg

[log]
	abbrevCommit = true

[merge]
	tool = vimdiff

#[mergetool "vimdiff3"]
# Don't forget to add -f for gvim
# 3 way diffs
#	cmd = vim -d \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\" -c \"wincmd J\"

[push]
	default = simple

[receive]
	denyNonFastForwards = true

[web]
	browser = webbrowser

[browser "webbrowser"]
	cmd = webbrowser -n

[gui]
	fontui = -family \"DejaVu Sans\" -size 18 -weight normal -slant roman -underline 0 -overstrike 0
	fontdiff = -family \"DejaVu Sans Mono\" -size 18 -weight normal -slant roman -underline 0 -overstrike 0