[madcoder]
    up-gitk=true

[alias]
    co=checkout -m
    ci=commit
    st=!git -p status
    pop=reset HEAD~1
    unstash=stash apply
    amend=commit --amend
    squash=commit --amend -C HEAD
    unstage=reset HEAD --
    track=add -N
    untrack=rm --cached

[core]
    #editor=gvim -f
    editor=vim
    excludesfile=~madcoder/.git-excludes
    preloadindex=true

[notes]
    displayRef = refs/notes/*

[push]
    default = upstream

[user]
    name = Pierre Habouzit
    email = phabouzit@apple.com

[color]
    ui     = auto
    diff   = auto
    branch = auto
    status = auto
    pager  = true
    interactive = auto
    grep   = auto

[color "diff"]
    meta = green
    frag = yellow
    old = magenta
    new = bold cyan

[color "status"]
    header = bold blue
    added  = green
    changed = bold red
    untracked = bold yellow
[merge]
    verbosity = 1
    conflictstyle = diff3
    tool = opendiff
[clean]
    requireForce = false
[pack]
    threads = 0
[advice]
    pushNonFastForward = false
    statusHints = false
[status]
    submodulesummary = 1

[merge "dpkg-mergechangelogs"]
    name = debian/changelog merge driver
    driver = dpkg-mergechangelogs -m %O %A %B %A
[sendemail]
    aliasesfile = /home/madcoder/.mutt/aliases
    aliasfiletype = mutt

[url "gitolite@git.corp:"]
    insteadOf = ssh://git.corp/srv/git/
    insteadOf = git.corp:/srv/git/
[reviewboard]
    url = http://reviews.corp/
[url "git://anonscm.debian.org"]
    insteadOf = git://git.debian.org
    insteadOf = git.debian.org:
[url "ssh://git.debian.org"]
    pushInsteadOf = git://git.debian.org
    pushInsteadOf = git.debian.org:
[branch "*"]
    mergeoptions = -Xpatience
[credential]
	helper = osxkeychain