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

[PATCH v2 0/2] rebase -i: introduce the 'break' command

From
Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>
Date
Oct 10, 2018, 08:53 UTC
Message-ID
<pull.43.v2.git.gitgitgadget@gmail.com>
In-Reply-To
<pull.43.git.gitgitgadget@gmail.com>

Stefan asked a while back [https://public-inbox.org/git/20180118183618.39853-3-sbeller@google.com/] for a todo command in interactive rebases that would essentially perform the "stop" part of the edit command, but without the "pick" part: interrupt the interactive rebase, with exit code 0, letting the user do things and stuff and look around, with the idea of continuing the rebase later (using git rebase --continue).

This patch introduces that, based on ag/rebase-i-in-c.
Changes since v1:
 * Wrapped the commit message correctly.
 * Added a preparatory patch to mention what happens in case an exec fails.
 * Mentioned the break command in the git-rebase(1) documentation.
Johannes Schindelin (2):
  rebase -i: clarify what happens on a failed `exec`
  rebase -i: introduce the 'break' command
 Documentation/git-rebase.txt | 6 +++++-
 rebase-interactive.c         | 1 +
 sequencer.c                  | 7 ++++++-
 t/lib-rebase.sh              | 2 +-
 t/t3418-rebase-continue.sh   | 9 +++++++++
 5 files changed, 22 insertions(+), 3 deletions(-)
base-commit: 34b47315d9721a576b9536492cca0c11588113a2
Published-As: https://github.com/gitgitgadget/git/releases/tags/pr-43%2Fdscho%2Frebase-i-break-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-43/dscho/rebase-i-break-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/43
Range-diff vs v1:
 -:  ---------- > 1:  2eefdb4874 rebase -i: clarify what happens on a failed `exec`
 1:  b358178548 ! 2:  c74e02c4b6 rebase -i: introduce the 'break' command
     @@ -11,11 +11,26 @@
          before cherry-picking a commit, or immediately after an 'exec' or a
          'merge'.
      
     -    This commit introduces that functionality, as the spanking new 'break' command.
     +    This commit introduces that functionality, as the spanking new 'break'
     +    command.
      
          Suggested-by: Stefan Beller <sbeller@google.com>
          Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
      
     +diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
     +--- a/Documentation/git-rebase.txt
     ++++ b/Documentation/git-rebase.txt
     +@@
     + the files and/or the commit message, amend the commit, and continue
     + rebasing.
     + 
     ++To interrupt the rebase (just like an "edit" command would do, but without
     ++cherry-picking any commit first), use the "break" command.
     ++
     + If you just want to edit the commit message for a commit, replace the
     + command "pick" with the command "reword".
     + 
     +
      diff --git a/rebase-interactive.c b/rebase-interactive.c
      --- a/rebase-interactive.c
      +++ b/rebase-interactive.c
-- 
gitgitgadget
Previous: Junio C HamanoNext: Johannes Schindelin via GitGitGadget
Message 8 of 27 in “rebase -i: introduce the 'break' command”
  1. 0/1 rebase -i: introduce the 'break' commandJohannes Schindelin via GitGitGadget, Oct 3, 2018
  2. 1/1 rebase -i: introduce the 'break' commandJohannes Schindelin via GitGitGadget, Oct 3, 2018
  3. Junio C HamanoOct 5, 2018
  4. Jacob KellerOct 5, 2018
  5. Johannes SchindelinOct 5, 2018
  6. Junio C HamanoOct 9, 2018
  7. Junio C HamanoOct 9, 2018
  8. 0/2 rebase -i: introduce the 'break' commandJohannes Schindelin via GitGitGadget, Oct 10, 2018
  9. 1/2 rebase -i: clarify what happens on a failed `exec`Johannes Schindelin via GitGitGadget, Oct 10, 2018
  10. Eric SunshineOct 10, 2018
  11. Junio C HamanoOct 11, 2018
  12. Johannes SchindelinOct 12, 2018
  13. 2/2 rebase -i: introduce the 'break' commandJohannes Schindelin via GitGitGadget, Oct 10, 2018
  14. Phillip WoodOct 11, 2018
  15. Johannes SchindelinOct 12, 2018
  16. Phillip WoodOct 12, 2018
  17. Johannes SchindelinOct 12, 2018
  18. 0/2 rebase -i: introduce the 'break' commandJohannes Schindelin via GitGitGadget, Oct 12, 2018
  19. 1/2 rebase -i: clarify what happens on a failed `exec`Johannes Schindelin via GitGitGadget, Oct 12, 2018
  20. 2/2 rebase -i: introduce the 'break' commandJohannes Schindelin via GitGitGadget, Oct 12, 2018
  21. Junio C HamanoOct 12, 2018
  22. Johannes SchindelinOct 12, 2018
  23. Junio C HamanoOct 12, 2018
  24. Johannes SchindelinOct 12, 2018
  25. 3/2 rebase -i: recognize short commands without argumentsJohannes Sixt, Oct 25, 2018
  26. Junio C HamanoOct 26, 2018
  27. Johannes SchindelinOct 26, 2018

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.