gistfile1.txt

[color]
  diff = auto
  status = auto
  branch = auto
  interactive = auto
[color "branch"]
  current = yellow reverse
  local = yellow
  remote = green
[color "diff"]
  meta = yellow bold
  frag = magenta bold
  old = red bold
  new = green bold
[color "status"]
  added = yellow
  changed = green
  untracked = cyan
[core]
  editor = mate -w
[alias]
  co = checkout
[apply]
  whitespace = strip
[mirror]
  summary = true
[gui]
  recentrepo = /Users/Andrew/Projects/macchiato
[merge]
  tool = p4merge # This will be the default merge tool invoked by git mergetool.
  keepBackup = false
[mergetool "p4merge"]
  cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge "$PWD/$BASE" "$PWD/$REMOTE" "$PWD/$LOCAL" "$PWD/$MERGED" 
  trustExitCode = false