Merge branch 'sg/merge-options' (early part)
authorJunio C Hamano <gitster@pobox.com>
Fri, 9 May 2008 03:06:36 +0000 (20:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 9 May 2008 03:06:36 +0000 (20:06 -0700)
commitca1c991...f8ac0ccaf976d44822076e1bba5bcd94
treeaa320cf...93864826fd28f0a84bac76d9f12a2d5ecopy hash to clipboard (tree)
parent31a3c6b...45aa61e45f1663871620eaf742f0abbbcopy hash to clipboard (diff)
parentefb779f...873e5aa36be29a4e551186c62c1b580ccopy hash to clipboard (diff)
Documentation/config.txt
builtin-fmt-merge-msg.c
contrib/completion/git-completion.bash