Merge branch 'maint-1.6.1' into maint
commit747f9d30ed706ebd930ef888971fff5638334831
authorJunio C Hamano <gitster@pobox.com>
Wed, 8 Apr 2009 06:05:14 +0000 (7 23:05 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 Apr 2009 06:05:14 +0000 (7 23:05 -0700)
tree935ab8af02497137b524cc64059ae3f555249ae7
parent714fddf2fc50cd5abb11d75837e6340edb9601f6
parentaa41cf8f43687579363a2360795cac621d5254ed
Merge branch 'maint-1.6.1' into maint

* maint-1.6.1:
  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
Documentation/git-checkout.txt
Documentation/gitattributes.txt