Merge branch 'maint-1.6.0' into maint-1.6.1
authorJunio C Hamano <gitster@pobox.com>
Thu, 14 May 2009 04:05:59 +0000 (21:05 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 14 May 2009 04:05:59 +0000 (21:05 -0700)
* maint-1.6.0:
ls-tree manpage: output of ls-tree is compatible with update-index
ls-tree manpage: use "unless" instead of "when ... is not"

1  2 
Documentation/git-ls-tree.txt
Simple merge