.gitconfig

[user]
    name = Alexis Daboville
    email = alexis.daboville@gmail.com
[color]
    diff = auto
    status = auto
    branch = auto
[alias]
    br = branch
    ci = commit
    co = checkout
    di = diff
    last = log -1 HEAD
    me = merge
    pop = stash pop
    purr = pull --rebase
    st = status -s

    edit-unmerged = "!f() { git diff --name-status --diff-filter=U | cut -f2 ; }; vim -p `f`"
    add-unmerged = "!f() { git diff --name-status --diff-filter=U | cut -f2 ; }; git add `f`"
    ls-unmerged = "diff --name-status --diff-filter=U"
    track-origin = "!git branch --set-upstream-to origin/`git rev-parse --abbrev-ref HEAD`"
    track-fork = "!git branch --set-upstream-to fork/`git rev-parse --abbrev-ref HEAD`"
    fork = "!f() { git remote add fork \"$1\" ; git config remote.pushDefault fork ; }; f"
    forget = update-index --assume-unchanged
    unforget = update-index --no-assume-unchanged
    changed = show --stat --oneline
    l = log --graph --all --date=relative\
        --pretty=format:'%C(cyan)%h%Creset %s %C(green)[%an/%cr]%Creset%C(red)%d%Creset'
    ll = log --graph --date=relative\
        --pretty=format:'%C(cyan)%h%Creset %s %C(green)[%an/%cr]%Creset%C(red)%d%Creset'
    update-all-submodules = submodule foreach git pull origin master

    amend = commit --amend
    squash = commit --amend -C HEAD
    branches = branch -vva
    drop-last = reset --soft HEAD^
    remotes = remote -v
    tags = tag -l
    tracking = branch -vv
    unstage = reset HEAD
    sign = config commit.gpgSign true
    do-not-sign = config commit.gpgSign false
[core]
    editor = vim
    excludesfile = ~/.cvsignore
[merge]
    tool = vimdiff
    ff = false
    autoStash = true
[rebase]
    autoStash = true
[push]
    default = current
    autoSetupRemote = true
[pull]
    ff = only
[rerere]
    enabled = true
[diff]
    algorithm = patience
[credential]
    helper = cache
[branch]
    autosetuprebase = always