From: "René Nyffenegger" <mail@renenyffenegger•ch>
To: Junio C Hamano <gitster@pobox•com>
Cc: git@vger•kernel.org
Subject: Re: [PATCH] fix typo 'In such these cases'
Date: Mon, 2 May 2016 21:41:13 +0200 [thread overview]
Message-ID: <5727AD59.3020905@renenyffenegger.ch> (raw)
In-Reply-To: <xmqqlh3ss14j.fsf@gitster.mtv.corp.google.com>
> Re substance, I am wondering if "In such a case" might be better, by
> the way. That is:
>
> A fast-forward is a special type of <<def_merge,merge>> where you have a
> <<def_revision,revision>> and you are "merging" another
> <<def_branch,branch>>'s changes that happen to be a descendant of what
> - you have. In such these cases, you do not make a new <<def_merge,merge>>
> + you have. In such a case, you do not make a new <<def_merge,merge>>
> <<def_commit,commit>> but instead just update to his
> revision. This will happen frequently on a
>
> It is not like there are multiple variants of "fast-forward"
> situations, in all of which the HEAD pointer is just moved without
> creating a new commit. There is only one variant of "fast-forward".
That's correct. Your suggestion makes more sense.
prev parent reply other threads:[~2016-05-02 19:41 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-02 7:38 [PATCH] fix typo 'In such these cases' René Nyffenegger
2016-05-02 18:46 ` Junio C Hamano
2016-05-02 19:29 ` René Nyffenegger
2016-05-02 19:36 ` Junio C Hamano
2016-05-02 19:41 ` René Nyffenegger [this message]
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=5727AD59.3020905@renenyffenegger.ch \
--to=mail@renenyffenegger$(echo .)ch \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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