From: Ramkumar Ramachandra <artagnon@gmail.com>
Date: Tue, 09 Aug 2011 05:26:07 GMT
Subject: Re: [PATCH 17/18] revert: Introduce --continue to continue the operation
Message-ID: <CALkWK0my7_Ocd9eFfGVcJreOJVkC_OyaUo1Q_U7o0mW04ab-YQ@mail.gmail.com>
In-Reply-To: <7vobzzwvug.fsf@alter.siamese.dyndns.org>

Hi Junio,

Junio C Hamano writes:
> Ramkumar Ramachandra <artagnon@gmail.com> writes:
>
>> Junio: Here's another small fixup patch for your convenience.
>
> Not very convenient I am afraid ;-)

Hm, I actually thought about this a bit.  Due to the volume of patches
you have to pick up and apply from emails everyday, I figured that you
must have optimized your email-patch application pipeline to such a
ridiculous extent that it's probably faster for you to apply patches
than even typing out a word.  A quick interactive rebase with
autosquash will then fix rr/revert-cherry-pick-continue, no?

>> --8<--
>
> This seems to be too short for "am -c"; have you tried applying it
> yourself first before sending it out?

No, I haven't tried this.  Will try it and patch "am -c" if necessary,
because I like this minimal scissor (picked it up from Jonathan I
think).

>> -test_expect_success '--signoff is not automatically propogated to
>> resolved conflict' '
>> +test_expect_success '--signoff is not automatically propagated to
>> resolved conflict' '
>
> Linewrapped.

Ugh.  Classic GMail web interface mistake.  I sometimes risk sending
small patches without git-send-email, and this is what happens.
Nothing helps: mutt's single-threaded'ness is starting to get on my
nerves now.

> I'll squash this manually, so no need to resend. Thanks.

Thanks.

-- Ram