gitconfig

[alias]
    a = add -u
    ap = add --patch
    authors = "!f() { git log --oneline --pretty='%ae' | sort | uniq -c | sort -nk1; }; f"
    br = branch --sort=committerdate
    bra = branch --all
    ca = commit --amend --no-edit
    ci = commit
    cim = commit -m
    co = checkout
    cob = checkout -b
    conflicts = diff --name-only --diff-filter=U
    cp = cherry-pick
    df = diff
    dfc = "!git log --left-right --graph --cherry-mark --oneline HEAD...$1"
    dfo = "!git shortlog --no-merges HEAD...$1"
    dfs = diff --staged
    dom = diff origin/master -w
    dum = diff upstream/master -w
    f = fetch
    fa = fetch --all
    lg = log --decorate --oneline --graph --branches --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold blue)(%ar) %C(bold yellow)%d%C(reset) %C(green)%s%C(reset) %C(dim green)- %an%C(reset)'
    lp = log -p --stat
    pl = pull
    plom = pull origin master
    plum = pull upstream master
    pr = pull-request
    pr-clean = "!git for-each-ref refs/heads/pr/* --format='%(refname)' | while read ref ; do branch=${ref#refs/heads/} ; git branch -D $branch ; done"
    prom = pull --rebase origin master
    prum = pull --rebase upstream master
    pu = push
    rb = rebase
    rba = rebase --abort
    rbc = rebase --continue
    rmt = remote -v
    rom = rebase origin/master -i
    rum = rebase upstream/master -i
    sh = stash show -p
    st = status
    uu = submodule update --remote --init

    # List aliases
    la = "!git config -l | grep alias | cut -c 7-"
[color]
    ui = true
    status = true
    branch = true
    diff = true
[core]
    pager = less -F -X -R
    preloadindex = true
[mergetool "fugitive"]
    cmd = vim -f -c \"Gvdiff\" \"$MERGED\"
[mergetool]
    keepBackup = false
[merge]
    tool = fugitive
[push]
    default = simple
[init]
    templatedir = ~/.git_template
[credential]
    helper = cache --timeout=432000
[grep]
    lineNumber = true
[advice]
    detachedHead = false

# Allow local customizations
[include]
    path = ~/.gitconfig_local
[pull]
	rebase = false