Re: [PATCH v5 26/26] doc: promote "git switch"
On Fri, Mar 22, 2019 at 3:00 PM Andrei Rybak <rybak.a.v@gmail.com> wrote:
Show 32 quoted lines
>
> On 3/21/19 2:16 PM, Nguyễn Thái Ngọc Duy wrote:
> > ...
> >
> > diff --git a/advice.c b/advice.c
> > index b224825637..27e39e6514 100644
> > --- a/advice.c
> > +++ b/advice.c
> > @@ -191,20 +191,20 @@ void NORETURN die_conclude_merge(void)
> > void detach_advice(const char *new_name)
> > {
> > const char *fmt =
> > - _("Note: checking out '%s'.\n"
> > + _("Note: switching to '%s'.\n"
> > "\n"
> > "You are in 'detached HEAD' state. You can look around, make experimental\n"
> > "changes and commit them, and you can discard any commits you make in this\n"
> > - "state without impacting any branches by performing another checkout.\n"
> > + "state without impacting any branches by switching back to a branch.\n"
> > "\n"
> > "If you want to create a new branch to retain commits you create, you may\n"
> > - "do so (now or later) by using -b with the checkout command again. Example:\n"
> > + "do so (now or later) by using -c with the switch command. Example:\n"
> > "\n"
> > - " git checkout -b <new-branch-name>\n"
> > + " git switch -c <new-branch-name>\n"
> > "\n"
> > "Or undo this checkout with:\n"
>
> With the start of the message being "switching to ..." this part could probably
> be also updated to something like "Or undo this switch with" or "Or undo this
> switch or checkout with".Maybe the neutral "operation"? E.g. "Or undo this operation with:"
Show 8 quoted lines
>
> > "\n"
> > - " git checkout -\n"
> > + " git switch -\n"
> > "\n"
> > "Turn off this advice by setting config variable advice.detachedHead to false\n\n");
> >
>
--
Duy
Duy Nguyen <pclouds@gmail.com>