[alias]

    # edit the commit message showing the whole diff
    c = commit -v

    # more concise status
    s = status --short --branch

    # shows diff with words in green and red instead of the whole lines
    d = diff --word-diff=color
    # the same, but for staged changes
    dc = diff --word-diff=color --cached --find-renames

    # pretty graphical log of the whole repository with labels
    l = log --graph --abbrev-commit --pretty=oneline --all --decorate=short --find-renames
    # ditto with commit time
    l2 = log --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --graph --decorate=short --all
    # usual log plus shows tags, branches, etc.
    lg = log --decorate=short

    # merge w/o fast forward
    m = merge --no-ff

    # add changes on a change-by-change basis (I always use this alias)
    a = add --patch

    # create and switch to a new branch
    cb = checkout -b
    # the opposite of the a alias
    cp = checkout --patch
    # short for checkout
    co = checkout
    ch = checkout

    # get changes from remote, and prune branches
    f = fetch --prune
    # stands for 'push new branch'
    pnb = push -u origin HEAD

    # show the list of files with conflicts
    conflicts = !git ls-files --unmerged | cut -f2 | uniq
    # edit the conflicted files in an editor
    edit-unmerged = "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; vim `f`"
    # add the resolved files
    add-unmerged = "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; git add `f`"
    # generate source for a graphviz graph, use like this: git graphviz | dotty -
    graphviz = "!f() { echo 'digraph git {' ; git log --pretty='format:  %h -> { %p }' \"$@\" | sed 's/[0-9a-f][0-9a-f]*/\"&\"/g' ; echo '}'; }; f"
    # starts an ad-hoc git server with this repository
    serve = !git daemon --reuseaddr --verbose  --base-path=. --export-all ./.git

# detect current shell
SH=$( ps -p $$ | awk 'END {print $NF}' )

# alias g for git in bash only, as oh-my-zsh's git plugin does it for you
if [[ "$SH" == "bash" ]]; then
    alias g='git'      # completion doesn't work with the alias
    # it works now http://nuclearsquid.com/writings/git-tricks-tips-workflows/
    complete -o default -o nospace -F _git g
fi

# git aliases
for cmd in c s d l m a f dc
do
    alias "g${cmd}"="git ${cmd}"
done