From: Junio C Hamano <gitster@pobox•com>
To: "René Nyffenegger" <mail@renenyffenegger•ch>
Cc: git@vger•kernel.org
Subject: Re: [PATCH] fix typo 'In such these cases'
Date: Mon, 02 May 2016 12:36:44 -0700 [thread overview]
Message-ID: <xmqqlh3ss14j.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <5727AA7F.70504@renenyffenegger.ch> ("René Nyffenegger"'s message of "Mon, 2 May 2016 21:29:03 +0200")
René Nyffenegger <mail@renenyffenegger•ch> writes:
>> René Nyffenegger <mail@renenyffenegger•ch> writes:
>>
>>> From 5e2b47833c8d434784fa1a797cfd6a087df10dc8 Mon Sep 17 00:00:00 2001
>>> From: =?UTF-8?q?Ren=C3=A9=20Nyffenegger?= <rene.nyffenegger@adp-gmbh•ch>
>>> Date: Mon, 2 May 2016 09:19:46 +0200
>>> Subject: [PATCH] Documentation: Fix typo 'In such these cases'
>>
>> For the next time, remember that these four lines are usually not
>> meant to go to the body of the e-mail.
>
> Thanks for the reminder. This kernel and git patch-process is fairly new
> to me. I will try to do better the next time.
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".
next prev parent reply other threads:[~2016-05-02 19:36 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 [this message]
2016-05-02 19:41 ` René Nyffenegger
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=xmqqlh3ss14j.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=mail@renenyffenegger$(echo .)ch \
/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