Merge branch 'maint-1.5.4' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 23 Apr 2008 06:37:06 +0000 (23:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 23 Apr 2008 06:37:06 +0000 (23:37 -0700)
commitd6958a1...32814af69a7571daa45252018c61f969
tree355fe5c...d4749e67d8979f80f7dcdc649b9aba41copy hash to clipboard (tree)
parent491b1b1...213c373a3e91004b1ab775d7e52ac1f3copy hash to clipboard (diff)
parent4f7ec79...0874d09be162bc7f16415a0ec2d36ae5copy hash to clipboard (diff)
Documentation/diff-options.txt
git-svn.perl
t/t0003-attributes.sh