Merge branch 'maint-1.5.4' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 16 Apr 2008 07:37:33 +0000 (00:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 16 Apr 2008 07:37:33 +0000 (00:37 -0700)
commit464509f...90f409d95e0820364ef7296d82942d8c
tree5825102...b17963d3890c487d88f6d69703620947copy hash to clipboard (tree)
parent2b6f0b0...78a713be51149f27c2c1172fe4afc9cdcopy hash to clipboard (diff)
parentd3e54c8...291c2d880ff3a72167c5d3159aed8e97copy hash to clipboard (diff)
Documentation/git-cvsserver.txt
builtin-apply.c
builtin-fmt-merge-msg.c
git-am.sh
git-bisect.sh
t/t6030-bisect-porcelain.sh