![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 8 Apr 2009 05:51:14 +0000 (22:51 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 8 Apr 2009 05:51:14 +0000 (22:51 -0700) | ||
| commit | aa41cf8f43687579363a2360795cac621d5254ed | |
| tree | cf46e92578852a6a36eaf359a517831fcf6379bb | tree | snapshot |
| parent | acb0b7b01f64cf55d508b469eb2a351359c0cd82 | commit | diff |
| parent | 20ff3ec28e1dc7b653bfdc7643cb55045d7913fc | commit | diff |
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
* 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 | diff1 | | diff2 | | blob | history |
| Documentation/gitattributes.txt | diff1 | | diff2 | | blob | history |