From: Felipe Contreras <felipe.contreras@gmail.com>
To: "Kerry, Richard" <richard.kerry@atos.net>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Felipe Contreras" <felipe.contreras@gmail.com>
Cc: "Philip Oakley" <philipoakley@iee.email>,
"git@vger.kernel.org" <git@vger.kernel.org>,
"Vít Ondruch" <vondruch@redhat.com>,
"Jacob Keller" <jacob.keller@gmail.com>,
"Alex Henrie" <alexhenrie24@gmail.com>,
"Junio C Hamano" <gitster@pobox.com>, "Jeff King" <peff@peff.net>,
"Elijah Newren" <newren@gmail.com>
Subject: RE: [PATCH 1/2] doc: pull: explain what is a fast-forward
Date: Fri, 25 Jun 2021 12:34:04 -0500 [thread overview]
Message-ID: <60d6138c185bf_cc8d20811@natae.notmuch> (raw)
In-Reply-To: <AS8PR02MB730230DADF38B6C572CE8DC39C069@AS8PR02MB7302.eurprd02.prod.outlook.com>
Kerry, Richard wrote:
>
> > From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
> > Sent: 25 June 2021 11:59
> > Perhaps, it's not like I've got much in the way of a holistic world view with
> > which to replace it.
> >
> > I do think "perfect" would do a few things it doesn't though, imagine reading
> > about it for the first time and not making the connection to tapes. Is it an
> > optimization? Is there a slow-forward? What if upstream rewound there
> > branch and I merge, is that a merge-backwards?
> >
> > It's not immediately obvious how rebase/merge/fast-forward relate or
> > if/when (e.g. merge sometimes being a merge-ff) they're incompatible
> > concepts.
>
> On the one hand, I think fast-forward is an entirely suitable term for git to use, based on what it does. Instantaneously moving the branch head pointer forward to the new head
> On the other hand I think it is distinctly different from the use with transport controls for linear media (ie tape - video or audio).
> For all of them fast-forward moves the play/record point relative to the media, maybe to the end (or to "now"), maybe not. There may or may not be a cueing play that happens while the tape is moving.
> For a modern stream (eg podcast) player, such as BBC Sounds (via its web-site) there is no fast-forward control. There is play/pause, +20 and -20 seconds, go to the start of the stream and (for live broadcasts) go to now. The latter is very close to Git's fast-forward, but is not labelled as such. There is also a time-line, where the user can go to an arbitrary point in time and play from there.
> Hardware players do have fast-forward controls, even for streams, or files.
Yes, but regardless of that for whatever reason it's already part of the
culture, and people are using fast-forward irrespective of the original
meaning:
"They fast-forward to present day ten years later, where he has been
hospitalized and is on life support." [1]
"So then fast-forward to now and, like, six months ago, they found the
script and called me up." [2]
This is similar to what happened with the floppy disk icon. New
generations may have no idea what it originally meant, regardless of
that today it means "save". Except the fast-forward button still exists
in many remote controls.
Same with other concepts like carbon copy. I'm not sure if newer
generations have ever seen an actual physical carbon copy take place. Or
a physical bookmark.
Words evolve beyond their original meaning, and today I think that has
already happened with fast-forward.
> So, yes, the term is very widely known in the wider world (even for those who didn't grow up with tape).
> And yes, irrespective of the above, it makes complete sense for git's usage.
Indeed.
[1] https://en.wikipedia.org/wiki/I_Need_a_Doctor
[2] https://en.wikipedia.org/wiki/Predators_(film)
--
Felipe Contreras
next prev parent reply other threads:[~2021-06-25 17:34 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-21 17:52 [PATCH 0/2] pull: documentation improvements Felipe Contreras
2021-06-21 17:52 ` [PATCH 1/2] doc: pull: explain what is a fast-forward Felipe Contreras
2021-06-22 5:51 ` Bagas Sanjaya
2021-06-23 1:11 ` Felipe Contreras
2021-06-24 14:21 ` Philip Oakley
2021-06-24 14:31 ` Felipe Contreras
2021-06-24 16:59 ` Philip Oakley
2021-06-24 19:05 ` Felipe Contreras
2021-06-24 22:07 ` Philip Oakley
2021-06-24 23:41 ` Felipe Contreras
2021-06-25 9:12 ` Ævar Arnfjörð Bjarmason
2021-06-25 10:47 ` Felipe Contreras
2021-06-25 10:59 ` Ævar Arnfjörð Bjarmason
2021-06-25 15:49 ` Felipe Contreras
2021-06-25 16:53 ` Kerry, Richard
2021-06-25 17:34 ` Felipe Contreras [this message]
2021-06-25 21:36 ` Felipe Contreras
2021-06-21 17:52 ` [PATCH 2/2] pull: improve default warning Felipe Contreras
2021-06-21 18:05 ` Alex Henrie
2021-06-21 18:51 ` Felipe Contreras
2021-06-21 21:47 ` Alex Henrie
2021-06-21 22:12 ` Felipe Contreras
2021-06-22 3:15 ` Alex Henrie
2021-06-22 4:26 ` Felipe Contreras
2021-06-22 15:06 ` Elijah Newren
2021-06-22 21:22 ` Alex Henrie
2021-06-23 2:20 ` Elijah Newren
2021-06-23 4:18 ` Felipe Contreras
2021-06-23 6:47 ` Elijah Newren
2021-06-23 17:24 ` Felipe Contreras
2021-06-23 1:09 ` Felipe Contreras
2021-06-23 7:54 ` Elijah Newren
2021-06-23 18:19 ` Felipe Contreras
2021-06-24 3:38 ` Alex Henrie
2021-06-24 5:55 ` Felipe Contreras
2021-06-27 0:17 ` Alex Henrie
2021-06-27 4:21 ` Felipe Contreras
2021-06-23 0:48 ` [PATCH v2 0/2] pull: documentation improvements Felipe Contreras
2021-06-23 0:48 ` [PATCH v2 1/2] doc: pull: explain what is a fast-forward Felipe Contreras
2021-06-23 0:48 ` [PATCH v2 2/2] pull: improve default warning 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=60d6138c185bf_cc8d20811@natae.notmuch \
--to=felipe.contreras@gmail.com \
--cc=alexhenrie24@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jacob.keller@gmail.com \
--cc=newren@gmail.com \
--cc=peff@peff.net \
--cc=philipoakley@iee.email \
--cc=richard.kerry@atos.net \
--cc=vondruch@redhat.com \
/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).