diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-04-07 23:05:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-07 23:05:43 -0700 |
| commit | 6da14ee14f85fe5766780e1cbe8d42d385638e9e (patch) | |
| tree | 0841b44063c977d3968615306c9481e4b5467ab2 /t | |
| parent | Merge branch 'lt/reflog-expire' (diff) | |
| parent | Merge branch 'maint-1.6.1' into maint (diff) | |
| download | tgif-6da14ee14f85fe5766780e1cbe8d42d385638e9e.tar.xz | |
Merge branch 'maint'
* maint:
Change double quotes to single quotes in message
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
Conflicts:
Documentation/git-checkout.txt
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7201-co.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7201-co.sh b/t/t7201-co.sh index 0e21632f19..bdb808af1a 100755 --- a/t/t7201-co.sh +++ b/t/t7201-co.sh @@ -171,7 +171,7 @@ test_expect_success 'checkout to detach HEAD' ' git checkout -f renamer && git clean -f && git checkout renamer^ 2>messages && (cat >messages.expect <<EOF -Note: moving to "renamer^" which isn'"'"'t a local branch +Note: moving to '\''renamer^'\'' which isn'\''t a local branch If you want to create a new branch from this checkout, you may do so (now or later) by using -b with the checkout command again. Example: git checkout -b <new_branch_name> |