From: Stefano Lattarini <stefano.lattarini@gmail.com>
To: Felipe Contreras <felipe.contreras@gmail.com>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
Martin von Zweigbergk <martinvonz@gmail.com>
Subject: Re: [RFC/PATCH v2 4/8] rebase: cherry-pick: fix abort of cherry mode
Date: Wed, 29 May 2013 13:13:59 +0200 [thread overview]
Message-ID: <51A5E2F7.4090505@gmail.com> (raw)
In-Reply-To: <1369801000-3705-5-git-send-email-felipe.contreras@gmail.com>
On 05/29/2013 06:16 AM, Felipe Contreras wrote:
> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
> ---
> git-rebase.sh | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/git-rebase.sh b/git-rebase.sh
> index 76900a0..9b5d78b 100755
> --- a/git-rebase.sh
> +++ b/git-rebase.sh
> @@ -335,6 +335,7 @@ skip)
> run_specific_rebase
> ;;
> abort)
> + test "$type" == "cherrypick" && git cherry-pick --abort
>
Bashism; please use "=", not "==".
> git rerere clear
> read_basic_state
> case "$head_name" in
Regards,
Stefano
next prev parent reply other threads:[~2013-05-29 11:14 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-29 4:16 [RFC/PATCH v2 0/8] rebase: new cherry-pick mode Felipe Contreras
2013-05-29 4:16 ` [RFC/PATCH v2 1/8] rebase: split the cherry-pick stuff Felipe Contreras
2013-05-29 4:16 ` [RFC/PATCH v2 2/8] rebase: cherry-pick: fix mode storage Felipe Contreras
2013-05-29 5:38 ` Martin von Zweigbergk
2013-05-29 5:45 ` Felipe Contreras
2013-05-29 4:16 ` [RFC/PATCH v2 3/8] rebase: cherry-pick: fix sequence continuation Felipe Contreras
2013-05-29 5:33 ` Martin von Zweigbergk
2013-05-29 5:41 ` Felipe Contreras
2013-05-29 5:51 ` Martin von Zweigbergk
2013-05-29 6:05 ` Felipe Contreras
2013-05-29 6:06 ` Martin von Zweigbergk
2013-05-29 4:16 ` [RFC/PATCH v2 4/8] rebase: cherry-pick: fix abort of cherry mode Felipe Contreras
2013-05-29 5:35 ` Martin von Zweigbergk
2013-05-29 5:47 ` Felipe Contreras
2013-05-29 11:13 ` Stefano Lattarini [this message]
2013-05-29 4:16 ` [RFC/PATCH v2 5/8] rebase: cherry-pick: fix command invocations Felipe Contreras
2013-05-29 4:16 ` [RFC/PATCH v2 6/8] rebase: cherry-pick: fix status messages Felipe Contreras
2013-05-29 4:16 ` [RFC/PATCH v2 7/8] rebase: cherry-pick: automatically commit stage Felipe Contreras
2013-05-29 4:16 ` [RFC/PATCH v2 8/8] rebase: use 'cherrypick' mode instead of 'am' Felipe Contreras
2013-05-29 23:23 ` [RFC/PATCH v2 0/8] rebase: new cherry-pick mode Junio C Hamano
2013-05-30 2:37 ` Felipe Contreras
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=51A5E2F7.4090505@gmail.com \
--to=stefano.lattarini@gmail.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=martinvonz@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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.