Merge branch 'maint-1.6.0' into maint-1.6.1
commitaa41cf8f43687579363a2360795cac621d5254ed
authorJunio C Hamano <gitster@pobox.com>
Wed, 8 Apr 2009 05:51:14 +0000 (7 22:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 Apr 2009 05:51:14 +0000 (7 22:51 -0700)
treecf46e92578852a6a36eaf359a517831fcf6379bb
parentacb0b7b01f64cf55d508b469eb2a351359c0cd82
parent20ff3ec28e1dc7b653bfdc7643cb55045d7913fc
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
Documentation/git-checkout.txt
Documentation/gitattributes.txt