Merge commit 'sg/merge-options^' into jk/renamelimit
authorJunio C Hamano <gitster@pobox.com>
Sat, 3 May 2008 20:18:20 +0000 (13:18 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 3 May 2008 20:18:20 +0000 (13:18 -0700)
commitec84569...c4e6d7b689c3eb0b53d1b2ba4803c7ea
treeb02046a...90e4a291d96042ea308841926c61c937copy hash to clipboard (tree)
parente4b9c36...a40a0869ee5fc64aaeabaf2655ef595bcopy hash to clipboard (diff)
parentefb779f...873e5aa36be29a4e551186c62c1b580ccopy hash to clipboard (diff)
Documentation/config.txt
builtin-fmt-merge-msg.c
contrib/completion/git-completion.bash