.gitconfig

[user]
  name = chorn
  email = chorn@chorn.com
  signingKey = chorn
[commit]
  gpgsign = true
  template = ~/.default-commit
[core]
  editor = vim
  pager = less -r
	excludesfile = /Users/chorn/.gitignore
[color]
  ui = auto
[pull]
  rebase = true
[push]
  default = tracking
[mergetool]
  keepBackup = true
[advice]
  statusHints = false
[diff]
  mnemonicprefix = true
  algorithm = patience
[format]
  subjectprefix = git
[prompt]
  showinfo = true
[rerere]
  enabled = true
[mergetool "Kaleidoscope"]
  cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
  trustexitcode = true
[merge]
  tool = Kaleidoscope
  defaultToUpstream = true
[difftool "Kaleidoscope"]
  cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[diff]
  tool = Kaleidoscope
[filter "hawser"]
  clean = git hawser clean %f
  smudge = git hawser smudge %f
  required = true
[filter "lfs"]
	smudge = git-lfs smudge -- %f
	process = git-lfs filter-process
	required = true
	clean = git-lfs clean -- %f
[filter "media"]
  required = true
  clean = git media clean %f
  smudge = git media smudge %f
[include]
  path = ~/.gitconfig-alias

; vim: ft=gitconfig sw=2 ts=2 et