aboutsummaryrefslogtreecommitdiff
path: root/builtin-checkout.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-04-07 23:05:43 -0700
committerJunio C Hamano <gitster@pobox.com>2009-04-07 23:05:43 -0700
commit6da14ee14f85fe5766780e1cbe8d42d385638e9e (patch)
tree0841b44063c977d3968615306c9481e4b5467ab2 /builtin-checkout.c
parent9e36d1173584d67ca61a5b43016bcbfe77e15946 (diff)
parent747f9d30ed706ebd930ef888971fff5638334831 (diff)
downloadgit-6da14ee14f85fe5766780e1cbe8d42d385638e9e.tar.gz
git-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 'builtin-checkout.c')
-rw-r--r--builtin-checkout.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin-checkout.c b/builtin-checkout.c
index 2e4fe1a45..ee1edd406 100644
--- a/builtin-checkout.c
+++ b/builtin-checkout.c
@@ -495,10 +495,10 @@ static void update_refs_for_switch(struct checkout_opts *opts,
create_symref("HEAD", new->path, msg.buf);
if (!opts->quiet) {
if (old->path && !strcmp(new->path, old->path))
- fprintf(stderr, "Already on \"%s\"\n",
+ fprintf(stderr, "Already on '%s'\n",
new->name);
else
- fprintf(stderr, "Switched to%s branch \"%s\"\n",
+ fprintf(stderr, "Switched to%s branch '%s'\n",
opts->new_branch ? " a new" : "",
new->name);
}
@@ -507,7 +507,7 @@ static void update_refs_for_switch(struct checkout_opts *opts,
REF_NODEREF, DIE_ON_ERR);
if (!opts->quiet) {
if (old->path)
- fprintf(stderr, "Note: moving to \"%s\" which isn't a local branch\nIf you want to create a new branch from this checkout, you may do so\n(now or later) by using -b with the checkout command again. Example:\n git checkout -b <new_branch_name>\n", new->name);
+ fprintf(stderr, "Note: moving to '%s' which isn't a local branch\nIf you want to create a new branch from this checkout, you may do so\n(now or later) by using -b with the checkout command again. Example:\n git checkout -b <new_branch_name>\n", new->name);
describe_detached_head("HEAD is now at", new->commit);
}
}