Code

Merge branch 'maint-1.6.1' into maint-1.6.2
authorJunio C Hamano <gitster@pobox.com>
Thu, 14 May 2009 04:06:11 +0000 (21:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 14 May 2009 04:06:11 +0000 (21:06 -0700)
commit213195185c8aa09d6192b85a3f78bf46f19f51a4
tree845e38396c86ca775bdcad2b6158c707fd315238
parenta83502f8e59b1dd2547f850379040ca3f931e00b
parent58066bec5a2cd8f5b6bb4884c8162364374ba0c1
Merge branch 'maint-1.6.1' into maint-1.6.2

* maint-1.6.1:
  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