git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
	Martin von Zweigbergk <martinvonz@gmail.com>,
	Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH 3/5] rebase: fix sequence continuation
Date: Tue, 28 May 2013 08:29:15 -0500	[thread overview]
Message-ID: <1369747757-10192-4-git-send-email-felipe.contreras@gmail.com> (raw)
In-Reply-To: <1369747757-10192-1-git-send-email-felipe.contreras@gmail.com>

We are not in am mode.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 git-rebase--cherry.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/git-rebase--cherry.sh b/git-rebase--cherry.sh
index ab1f8b7..ca78b1b 100644
--- a/git-rebase--cherry.sh
+++ b/git-rebase--cherry.sh
@@ -5,13 +5,15 @@
 
 case "$action" in
 continue)
-	git am --resolved --resolvemsg="$resolvemsg" &&
-	move_to_original_branch
+	git cherry-pick --continue &&
+	move_to_original_branch &&
+	rm -rf "$state_dir"
 	exit
 	;;
 skip)
-	git am --skip --resolvemsg="$resolvemsg" &&
-	move_to_original_branch
+	git cherry-pick --skip &&
+	move_to_original_branch &&
+	rm -rf "$state_dir"
 	exit
 	;;
 esac
-- 
1.8.3.rc3.312.g47657de

  parent reply	other threads:[~2013-05-28 13:31 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-28 13:29 [PATCH 0/5] rebase: improve the keep-empty Felipe Contreras
2013-05-28 13:29 ` [PATCH 1/5] rebase: split the cherry-pick stuff Felipe Contreras
2013-05-28 22:24   ` Junio C Hamano
2013-05-28 13:29 ` [PATCH 2/5] rebase: fix 'cherry' mode storage Felipe Contreras
2013-05-28 22:29   ` Junio C Hamano
2013-05-29  3:03     ` Felipe Contreras
2013-05-28 13:29 ` Felipe Contreras [this message]
2013-05-28 22:31   ` [PATCH 3/5] rebase: fix sequence continuation Junio C Hamano
2013-05-29  5:53     ` Felipe Contreras
2013-05-28 13:29 ` [PATCH 4/5] rebase: fix abort of cherry mode Felipe Contreras
2013-05-28 13:29 ` [PATCH 5/5] rebase: fix cherry-pick invocations Felipe Contreras
2013-05-28 22:46   ` Junio C Hamano
2013-05-28 22:51     ` Junio C Hamano
2013-05-29  5:57       ` Felipe Contreras
2013-05-29  5:55     ` Felipe Contreras
2013-05-28 13:33 ` [PATCH 0/5] rebase: improve the keep-empty Felipe Contreras
2013-05-28 17:17 ` Martin von Zweigbergk
2013-05-29  3:01   ` 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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1369747757-10192-4-git-send-email-felipe.contreras@gmail.com \
    --to=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. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).