.gitconfig

[user]
    name = Guillaume Nicolas
    email = guillaume.nicolas@spacelephant.org
	signingkey = 83C465494403846D

[branch]
    autosetuprebase = always

[color]
    diff = auto
    status = auto
    branch = auto
    interactive = auto
    ui = auto

[commit]
	gpgsign = true

[rerere]
    enabled = true

[diff]
    mnemonicprefix = true
	submodule = log

[help]
    autocorrect = -1

[pull]
    rebase = preserve

[push]
    default = simple

[rebase]
    autostash = true

[alias]
    co = checkout
    ci = commit
    cia = !git add -A && git commit
    br = branch
    df = diff
    st = status -s

    amend = commit --amend
    who = shortlog -s --
    changes = diff --name-status -r
    dic = diff --cached
    ds = diff --stat -r
    wdiff = diff --word-diff
    undo = !git reset --soft HEAD^
    unstage = reset HEAD --

    # Affiche le diff avant pull
    do = diff --name-status -r ORIG_HEAD HEAD

    # 2 logs avec visualisation des branches
    # Long
    lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative --all
    # Court
    oneline = log --pretty=oneline --abbrev-commit --graph --decorate
    # Long avec fichiers modifies
    lgf = log --name-status --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --date=relative
    # Long avec message de commit complet
    flg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --date=relative

    # Un 'status' concis
    s = "!git diff --name-status | sed -e 's/^/W /' ; git diff --cached --name-status | sed -e 's/^/C /'"

    emerge = merge --no-ff

    # ajouter les fichiers modifies.
    addm = !git-ls-files -m -z | xargs -0 git add && git status

    # ajouter les fichiers inconnus.
    addu = !git-ls-files -o --exclude-standard -z | xargs -0 git add && git status

    # supprimer les fichiers marques comme effaces.
    rmm = !git ls-files -d -z | xargs -0 git rm && git status

    # Commandes SVN
    svnc = svn dcommit
    svnu = svn rebase
    
    # Init et update des submodules
    pup = "!git submodule init && git submodule update"

    # Pushs all submodules to origin master
    pushsub = submodule foreach "git push origin master"
     
    # Pull submodules from origin master
    pullsub = submodule foreach "git pull origin master"
 
[credential]
	helper = cache --timeout=259200
[webui]
	autoupdate = true
[status]
	submoduleSummary = true
	showUntrackedFiles = all
[fetch]
	recurseSubmodules = on-demand
[log]
	abbrevCommit = true
[filter "lfs"]
	clean = git-lfs clean %f
	smudge = git-lfs smudge %f
	required = true
[color "diff-highlight"]
	oldNormal = red bold
	oldHighlight = red bold 52
	newNormal = green bold
	newHighlight = green bold 22
[pager]
	diff = diff-so-fancy | less --tabs=1,5 -RFX
	show = diff-so-fancy | less --tabs=1,5 -RFX
[gpg]
	program = gpg