Re: [PATCH 17/18] revert: Introduce --continue to continue the operation

From: Junio C Hamano <gitster@pobox.com>
Date: Aug 8, 2011, 16:28 UTC
Message-ID: <7vobzzwvug.fsf@alter.siamese.dyndns.org>
In-Reply-To: <CALkWK0mKTXUxW=PT_wHEVAzUSgPdZ1s18-9ndZKJqSf6NwVH7w@mail.gmail.com>

Ramkumar Ramachandra <artagnon@gmail.com> writes:

> Junio: Here's another small fixup patch for your convenience.

Not very convenient I am afraid ;-)

> --8<--

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

Show 21 quoted lines

> Subject: [PATCH] fixup! revert: Introduce --continue to continue the
>  operation
>
>
> Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
> ---
>  t/t3510-cherry-pick-sequence.sh |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/t/t3510-cherry-pick-sequence.sh b/t/t3510-cherry-pick-sequence.sh
> index 78f3f01..3bca2b3 100755
> --- a/t/t3510-cherry-pick-sequence.sh
> +++ b/t/t3510-cherry-pick-sequence.sh
> @@ -171,7 +171,7 @@ test_expect_success '--continue respects opts' '
>         grep "cherry picked from" anotherpick_msg
>  '
>
> -test_expect_success '--signoff is not automatically propogated to
> resolved conflict' '
> +test_expect_success '--signoff is not automatically propagated to
> resolved conflict' '

Linewrapped.

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