gitconfig

[user]
	email = m.bollot@code-troopers.com
	name = Matthieu Bollot
[alias]
    st = status -sb
    ci = commit -s
    br = branch
    co = checkout
    df = diff
    ready = rebase -i @{u}
    lg = log --pretty=format:'%Cred%h%Creset -%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'


    ds = diff --staged      # git ds - diff your staged changes == review before committing.
    fup = log --since '1 day ago' --oneline --author <YOUR_EMAIL>  # I know what you did yesterday - great for follow-ups

    # some resets without explanation
    r = reset
    r1 = reset HEAD^
    r2 = reset HEAD^^
    rh = reset --hard
    rh1 = reset HEAD^ --hard
    rh2 = reset HEAD^^ --hard

    # basic shortcuts
    cp = cherry-pick
    cl = clone
    diff = diff --word-diff
    dc = diff --cached

    # stash shortcuts
    sl = stash list
    sa = stash apply
    ss = stash save

    # log related - thanks to @mwd410
    l = log
    lh = log --graph
    la = !git lh --date-order --all 2> /dev/null
    lb = log --graph --simplify-by-decoration
    lba = !git lb --all
    h = !git --no-pager log --graph -n 15
    a = !git --no-pager la -n 15

    rp = remote prune origin
	merge-log = "!f() { git log --stat \"$1^..$1\"; }; f"

[core]
    pager = less -+$LESS -FRX

[rerere]
	enabled = true
[push]
	default = simple
[branch]
	autosetuprebase = always
[status]
	showUntrackedFiles = all
[color "branch"]
    current = yellow reverse
    local = yellow
    remote = green
[color "diff"]
    meta = yellow bold
    frag = magenta bold
    old = red bold
    new = green bold
[color "status"]
    added = yellow
    changed = green
    untracked = cyan
[core]
	editor = vim
	excludesfile = ~/.gitignore
[merge]
    tool = vimdiff
[mergetool "vimdiff"]
    cmd = vim -d "$LOCAL" "$MERGED" "$REMOTE"
    trustExitCode = true