From: Junio C Hamano <gitster@pobox.com>
To: Elijah Newren <newren@gmail.com>
Cc: Felipe Contreras <felipe.contreras@gmail.com>,
Git <git@vger.kernel.org>, Alex Henrie <alexhenrie24@gmail.com>,
Jeff King <peff@peff.net>, Philip Oakley <philipoakley@iee.email>
Subject: Re: [PATCH v3 01/16] doc: pull: explain what is a fast-forward
Date: Mon, 07 Dec 2020 15:08:50 -0800 [thread overview]
Message-ID: <xmqqblf58b99.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <CABPp-BEkKMuZHWJ8mrFUFm3okDDsMHeZZNxtGzgq-RLLddMxdw@mail.gmail.com> (Elijah Newren's message of "Mon, 7 Dec 2020 14:40:37 -0800")
Elijah Newren <newren@gmail.com> writes:
>> > ... I find the phrase "in a fast-forward way" a bit awkward.
>> > Perhaps use the 'fast-forward' as a verb, i.e.
>> >
>> > Then `git pull` notices that what is being merged is a
>> > descendant of our current branch, and fast-forwards our
>> > 'master' branch to the commit.
>> >
>> > or something like that? It should be in line with the spirit in
>> > which glossary defines fast-forward, I would think.
>> ...
> If you read the release notes and even various messages printed by
> git, "fast-forwards", "fast-forwarded", "fast-forwarding", and "to
> fast-forward" all appear multiple times. And yes, "fast-forward" also
> appears multiple times as a noun in addition to the various uses as a
> verb. So, I'd say the glossary just isn't comprehensive because in
> this case we have a word that serves as both a noun and a verb.
Ah, sorry, I didn't mean noun-vs-verb when I mentioned the glossary.
I thought that the idea that the word can be used as a verb, after
discussing advise() messages that tells the users that they can
"merge, rebase or fast-forward", was given and not something anybody
needs to be explained about.
The other half of what I suggested was to explain what situation is
fast-forwardable, i.e. "notices ... is a descendant of", and I made
sure that the explanation was in line with the grossary. Without it
explained in-place in the text, readers who need to be told what a
fast-forward is needs to go to and come back from the glossary while
reading this page, which was what I tried to improve while we are
trying to find a better phrasing.
next prev parent reply other threads:[~2020-12-07 23:09 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-05 19:52 [PATCH v3 00/16] pull: default warning improvements Felipe Contreras
2020-12-05 19:52 ` [PATCH v3 01/16] doc: pull: explain what is a fast-forward Felipe Contreras
2020-12-07 20:45 ` Junio C Hamano
2020-12-07 22:22 ` Felipe Contreras
2020-12-07 22:40 ` Elijah Newren
2020-12-07 23:08 ` Junio C Hamano [this message]
2020-12-08 0:20 ` Felipe Contreras
2020-12-08 0:17 ` Felipe Contreras
2020-12-08 1:23 ` Elijah Newren
2020-12-08 14:37 ` Felipe Contreras
2020-12-08 18:55 ` Felipe Contreras
2020-12-05 19:52 ` [PATCH v3 02/16] pull: improve default warning Felipe Contreras
2020-12-07 20:55 ` Junio C Hamano
2020-12-07 22:29 ` Felipe Contreras
2020-12-05 19:53 ` [PATCH v3 03/16] pull: refactor fast-forward check Felipe Contreras
2020-12-05 19:53 ` [PATCH v3 04/16] pull: cleanup autostash check Felipe Contreras
2020-12-05 19:53 ` [PATCH v3 05/16] pull: trivial cleanup Felipe Contreras
2020-12-05 19:53 ` [PATCH v3 06/16] pull: move default warning Felipe Contreras
2020-12-05 19:53 ` [PATCH v3 07/16] pull: display default warning only when non-ff Felipe Contreras
2020-12-05 19:53 ` [PATCH v3 08/16] pull: trivial whitespace style fix Felipe Contreras
2020-12-05 19:53 ` [PATCH v3 09/16] pull: introduce --merge option Felipe Contreras
2020-12-05 19:53 ` [PATCH v3 10/16] pull: show warning with --ff Felipe Contreras
2020-12-05 19:53 ` [PATCH v3 11/16] rebase: add REBASE_DEFAULT Felipe Contreras
2020-12-05 19:53 ` [PATCH v3 12/16] pull: move configurations fetches Felipe Contreras
2020-12-05 19:53 ` [PATCH v3 13/16] pull: add proper error with --ff-only Felipe Contreras
2020-12-05 20:15 ` Felipe Contreras
2020-12-05 20:19 ` [PATCH 1/2] " Felipe Contreras
2020-12-05 20:19 ` [PATCH 2/2] tentative: pull: change the semantics of --ff-only Felipe Contreras
2020-12-05 19:53 ` [PATCH v3 14/16] test: merge-pull-config: trivial cleanup Felipe Contreras
2020-12-05 19:53 ` [PATCH v3 15/16] test: pull-options: revert unnecessary changes Felipe Contreras
2020-12-05 19:53 ` [PATCH v3 16/16] pull: trivial memory fix Felipe Contreras
2020-12-07 20:55 ` [PATCH v3 00/16] pull: default warning improvements Junio C Hamano
2020-12-07 22:33 ` Felipe Contreras
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqblf58b99.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=alexhenrie24@gmail.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=newren@gmail.com \
--cc=peff@peff.net \
--cc=philipoakley@iee.email \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).