gistfile1.txt

[color]
  branch = auto
  diff = auto
  status = auto
	ui = auto

[color "branch"]
  current = yellow reverse
  local = yellow
  remote = green

[color "diff"]
  meta = yellow bold
  frag = magenta bold
  old = red bold
  new = green bold
	whitespace = red reverse

[color "status"]
  added = yellow
  changed = green
  untracked = cyan
[alias]
	st = status
	co = commit
	ch = checkout
	unadd = reset HEAD
	hist = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --
[credential]
	helper = osxkeychain
[push]
	default = simple
[branch]
	autosetuprebase = always
	autosetupmerge = true
[mergetool]
	keepBackup = true