From csardi.gabor at gmail.com  Thu Jan 25 01:52:54 2018
From: csardi.gabor at gmail.com (=?UTF-8?B?R8OhYm9yIENzw6FyZGk=?=)
Date: Thu, 25 Jan 2018 00:52:54 +0000
Subject: [Rd] Why R should never move to git
In-Reply-To: <f47a64d9-f7cc-b2e6-c153-38c6ee71a252@gmail.com>
References: <10a2b81e-4d5d-e387-5e0d-bfe58fbf16ca@gmail.com>
 <CABtg=K=apVWjEaE6pcv0FBkOMDJHFeBLPi9VU3n_+xmuYs4gVg@mail.gmail.com>
 <ba18a519-73c0-5b00-ae47-5b7e411e1600@gmail.com>
 <CABtg=KkzmuqeGmi2JUa5fOJXrY_9=J2Z7Uh3s68Y99GQACgUBw@mail.gmail.com>
 <e2b65210-ef35-9975-0aef-648ab81f289b@gmail.com>
 <CABtg=Km0O67Xo_vEoqiS0ny27qzo4mJTtWSJOjO8OUatLFUk+A@mail.gmail.com>
 <f47a64d9-f7cc-b2e6-c153-38c6ee71a252@gmail.com>
Message-ID: <CABtg=Kn8eD8QO_0qDJpjMiKNiYZeAu3k_b4c=kbnY30n3tYVwA@mail.gmail.com>

On Thu, Jan 25, 2018 at 12:43 AM, Duncan Murdoch
<murdoch.duncan at gmail.com> wrote:
[...]
> But that's only half the battle.  If I did that and emailed the diff to a
> maintainer, I'm guessing I'd be told I should put together a PR instead.
> And as I found out, that's not easy, if I already have a fork of the
> repository that contains changes and I don't want to blow it away.

You can always create a branch, off any commit in the DAG, as in the
previous emails,
and then replay the changes there.

But there are alternatives as well, e.g. you can also create a branch
from the tip of master,
and then remove the two old commits, and keep the last one. I usually
do this via sg like

git rebase HEAD^^^^ --interactive

which will start an editor with the 4 latest commits. Then you just
remove the ones
you don't want, save, exit, and then git will perform the rebase, as desired.

G.

> Duncan Murdoch



[Rd] Why R should never move to git
=?UTF-8?B?R8OhYm9yIENzw6FyZGk=?=