[madcoder]
    up-gitk=true

[alias]
    co=checkout -m
    ci=commit -s
    st=!git -p status
    pop=reset HEAD~1
    unstash=stash apply
    amend=commit -s --amend
    squash=commit -s --amend -C HEAD
    p=!git push origin HEAD
    debtag=!git tag -f -a -s -m `git-symbolic-ref HEAD | sed -e 's~refs/heads/~~'`/`dpkg-parsechangelog | sed -n 's/^Version: \\(.*:\\)\\?//p'` `git-symbolic-ref HEAD | sed -e 's~refs/heads/~~'`/`dpkg-parsechangelog | sed -n 's/^Version: \\(.*:\\)\\?//p'`
    b64=commit -sm'64bits fix'
    send=send-email --annotate --compose -C -C -M -n --to
    stage=add
    unstage=reset HEAD --
    track=add -N
    untrack=rm --cached

[merge]
    tool=diffuse

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

[push]
    default = tracking

[user]
    name  = Pierre Habouzit
    email = madcoder@debian.org

[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
[clean]
    requireForce = false
[pack]
    threads = 0
[status]
    submodulesummary = 1
[push]
    default = tracking

[sendemail]
    smtpserver = smtp.mail.intersec.com
    smtpuser = madcoder

[merge "dpkg-mergechangelogs"]
    name = debian/changelog merge driver
    driver = dpkg-mergechangelogs -m %O %A %B %A