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)
commit58066bec5a2cd8f5b6bb4884c8162364374ba0c1
treeffda17b9a7ebbca8a7c96fc43a4e70c134dbd108
parentf29d669a91b2c8f1c68c1f4fb10f03456a997fa8
parentc98a95eea825ffe66ed690064c80733656506c66
Merge branch 'maint-1.6.0' into maint-1.6.1

* 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"
Documentation/git-ls-tree.txt