From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 8 Apr 2009 05:51:14 +0000 (-0700)
Subject: Merge branch 'maint-1.6.0' into maint-1.6.1
X-Git-Tag: v1.6.2.3~1^2~6
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=aa41cf8f43687579363a2360795cac621d5254ed;p=git.git

Merge branch 'maint-1.6.0' into maint-1.6.1

* maint-1.6.0:
  Documentation: clarify .gitattributes search
  git-checkout.txt: clarify that <branch> applies when no path is given.
  git-checkout.txt: fix incorrect statement about HEAD and index
---

aa41cf8f43687579363a2360795cac621d5254ed