git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 4/5] rebase: fix abort of cherry mode

From
Felipe Contreras <felipe.contreras@gmail.com>
Date
May 28, 2013, 13:29 UTC
Message-ID
<1369747757-10192-5-git-send-email-felipe.contreras@gmail.com>
In-Reply-To
<1369747757-10192-1-git-send-email-felipe.contreras@gmail.com>
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 b7759d5..48bd1b8 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -335,6 +335,7 @@ skip)
 	run_specific_rebase
 	;;
 abort)
+	test "$type" == "cherry" && git cherry-pick --abort
 	git rerere clear
 	read_basic_state
 	case "$head_name" in
-- 
1.8.3.rc3.312.g47657de
Previous: Felipe ContrerasNext: Felipe Contreras
Message 10 of 18 in “rebase: improve the keep-empty”
  1. 0/5 rebase: improve the keep-emptyFelipe Contreras, May 28, 2013
  2. 1/5 rebase: split the cherry-pick stuffFelipe Contreras, May 28, 2013
  3. Junio C HamanoMay 28, 2013
  4. 2/5 rebase: fix 'cherry' mode storageFelipe Contreras, May 28, 2013
  5. Junio C HamanoMay 28, 2013
  6. Felipe ContrerasMay 29, 2013
  7. 3/5 rebase: fix sequence continuationFelipe Contreras, May 28, 2013
  8. Junio C HamanoMay 28, 2013
  9. Felipe ContrerasMay 29, 2013
  10. 4/5 rebase: fix abort of cherry modeFelipe Contreras, May 28, 2013
  11. 5/5 rebase: fix cherry-pick invocationsFelipe Contreras, May 28, 2013
  12. Junio C HamanoMay 28, 2013
  13. Junio C HamanoMay 28, 2013
  14. Felipe ContrerasMay 29, 2013
  15. Felipe ContrerasMay 29, 2013
  16. Felipe ContrerasMay 28, 2013
  17. Martin von ZweigbergkMay 28, 2013
  18. Felipe ContrerasMay 29, 2013

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.