diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-04-08 06:05:43 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-04-08 06:05:43 (GMT) |
commit | 6da14ee14f85fe5766780e1cbe8d42d385638e9e (patch) | |
tree | 0841b44063c977d3968615306c9481e4b5467ab2 /t/t7201-co.sh | |
parent | 9e36d1173584d67ca61a5b43016bcbfe77e15946 (diff) | |
parent | 747f9d30ed706ebd930ef888971fff5638334831 (diff) | |
download | git-6da14ee14f85fe5766780e1cbe8d42d385638e9e.zip git-6da14ee14f85fe5766780e1cbe8d42d385638e9e.tar.gz git-6da14ee14f85fe5766780e1cbe8d42d385638e9e.tar.bz2 |
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/t7201-co.sh')
-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 0e21632..bdb808a 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> |