From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 14 May 2009 04:05:59 +0000 (-0700)
Subject: Merge branch 'maint-1.6.0' into maint-1.6.1
X-Git-Tag: v1.6.3.2~7^2~2^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=58066bec5a2cd8f5b6bb4884c8162364374ba0c1;p=git.git

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"
---

58066bec5a2cd8f5b6bb4884c8162364374ba0c1