From: Christian Couder <christian.couder@gmail.com>
To: Sergey Organov <sorganov@gmail.com>
Cc: Kaartic Sivaraam <kaartic.sivaraam@gmail.com>,
git <git@vger.kernel.org>, Junio C Hamano <gitster@pobox.com>,
Jakub Narebski <jnareb@gmail.com>,
Markus Jansen <mja@jansen-preisler.de>,
Gabriel Alcaras <gabriel.alcaras@telecom-paristech.fr>,
Jeff King <peff@peff.net>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Jiang Xin <worldhello.net@gmail.com>,
Jacob Keller <jacob.keller@gmail.com>,
Eric Sunshine <sunshine@sunshineco.com>,
Igor Djordjevic <igor.d.djordjevic@gmail.com>,
Johannes Sixt <j6t@kdbg.org>,
Phillip Wood <phillip.wood@talktalk.net>,
Phillip Wood <phillip.wood@dunelm.org.uk>
Subject: Re: Draft of Git Rev News edition 38
Date: Tue, 17 Apr 2018 00:30:21 +0200 [thread overview]
Message-ID: <CAP8UFD3ei7NEfiqBbWe_PKdrcW93t2pA=u-ub29X+jGOi9-Jwg@mail.gmail.com> (raw)
In-Reply-To: <87efjf6uwg.fsf@javad.com>
On Mon, Apr 16, 2018 at 5:19 PM, Sergey Organov <sorganov@gmail.com> wrote:
> Kaartic Sivaraam <kaartic.sivaraam@gmail.com> writes:
>
>> 1. I see the following sentence in the "Rebasing merges: a jorney to the
>> ultimate solution (Road Clear) (written by Jacob Keller)" article
>>
>> "A few examples were tried, but it was proven that the original
>> concept did not work, as dropped commits could end up being
>> replaid into the merge commits, turning them into "evil"
>> merges."
>>
>> I'm not sure if 'replaid' is proper English assuming the past tense of
>> replay was intended there (which I think is 'replayed').
>
> It could have meant, say, "reapplied", -- we need to ask the author.
Yeah it could but I would say that it is not very likely compared to
"replayed", so I changed it to "replayed". And yeah I can change it to
something else if Jake (who is Cc'ed) prefers.
> While we are at it, please also consider to replace "original concept"
> by "original algorithm", as it didn't work due to a mistake in the
> algorithm as opposed to failure of the concept itself.
Ok, it's now "original algorithm".
Thanks,
Christian.
next prev parent reply other threads:[~2018-04-16 22:30 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-15 22:11 Draft of Git Rev News edition 38 Christian Couder
2018-04-16 8:55 ` Christian Couder
2018-04-16 12:29 ` Sergey Organov
2018-04-16 13:08 ` Christian Couder
2018-04-16 15:03 ` Sergey Organov
2018-04-16 15:07 ` Kaartic Sivaraam
2018-04-16 15:19 ` Sergey Organov
2018-04-16 22:30 ` Christian Couder [this message]
2018-04-17 0:58 ` Jacob Keller
2018-04-16 22:26 ` Christian Couder
2018-04-17 2:17 ` Kaartic Sivaraam
2018-04-17 7:33 ` Christian Couder
2018-04-16 15:52 ` Jacob Keller
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAP8UFD3ei7NEfiqBbWe_PKdrcW93t2pA=u-ub29X+jGOi9-Jwg@mail.gmail.com' \
--to=christian.couder@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=gabriel.alcaras@telecom-paristech.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=igor.d.djordjevic@gmail.com \
--cc=j6t@kdbg.org \
--cc=jacob.keller@gmail.com \
--cc=jnareb@gmail.com \
--cc=kaartic.sivaraam@gmail.com \
--cc=mja@jansen-preisler.de \
--cc=peff@peff.net \
--cc=phillip.wood@dunelm.org.uk \
--cc=phillip.wood@talktalk.net \
--cc=sorganov@gmail.com \
--cc=sunshine@sunshineco.com \
--cc=worldhello.net@gmail.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).