diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-04-07 22:51:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-07 22:51:14 -0700 |
| commit | aa41cf8f43687579363a2360795cac621d5254ed (patch) | |
| tree | cf46e92578852a6a36eaf359a517831fcf6379bb /Documentation/merge-strategies.txt | |
| parent | Merge branch 'maint-1.6.0' into maint-1.6.1 (diff) | |
| parent | Documentation: clarify .gitattributes search (diff) | |
| download | tgif-aa41cf8f43687579363a2360795cac621d5254ed.tar.xz | |
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
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions