Code

Merge branch 'maint-1.6.2' into maint
authorJunio C Hamano <gitster@pobox.com>
Sat, 16 May 2009 07:12:58 +0000 (00:12 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 16 May 2009 07:12:58 +0000 (00:12 -0700)
commit13c5833c094e3d889df8e4a4f0ff30bb874c1b14
treebec2e01906c7dd53a52d2f32cc81141931236666
parent4774780ab196ff4ace780445c06c8e5bfffffc49
parent213195185c8aa09d6192b85a3f78bf46f19f51a4
Merge branch 'maint-1.6.2' into maint

* maint-1.6.2:
  ls-tree manpage: output of ls-tree is compatible with update-index
  ls-tree manpage: use "unless" instead of "when ... is not"