From: Ramkumar Ramachandra <artagnon@gmail.com>
Date: Thu, 28 Jul 2011 20:18:51 GMT
Subject: Re: [PATCH 10/18] revert: Save data for continuing after conflict resolution
Message-ID: <CALkWK0=GY_MqbA6vofGJDkpG1YFs41mzqpB-8jitkt3gZjb4wg@mail.gmail.com>
In-Reply-To: <20110728174519.GB29866@elie.dc0b.debconf.org>

Hi again,

Jonathan Nieder writes:
> Ramkumar Ramachandra wrote:
>> That these two files alone are not enough to implement a "--continue"
>> that remembers the command-line options specified; later patches in
>> the series save them too.
>
> Micronit: I think this sentence has an extra "That".

Ugh.  Fixed.

>> +pristine_detach () {
>> +     git checkout -f "$1^0" &&
>> +     git read-tree -u --reset HEAD &&
>> +     git clean -d -f -f -q -x
>> +}
>
> Nit: probably best to include the "rm -rf .git/sequencer" in this
> function.  But I don't think that should hold up the patch.

Ah, good idea.  Fixed.

Thanks.

-- Ram