Merge branch 'zj/diff-stat-dyncol'
authorJunio C Hamano <gitster@pobox.com>
Tue, 6 Mar 2012 22:53:06 +0000 (14:53 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 6 Mar 2012 22:53:06 +0000 (14:53 -0800)
commitaf05021...e44051426179248614a046896b5d40c0
tree5f77835...648283755312ad61f26aa6f1c3759601copy hash to clipboard (tree)
parent556c5e0...0f17efb412a192a430fe9027840ed718copy hash to clipboard (diff)
parentdf44483...5dde62f4b49c80fd90d7fe12ddcfb084copy hash to clipboard (diff)
Documentation/diff-options.txt
builtin/merge.c
contrib/completion/git-completion.bash
diff.c
diff.h