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

[PATCHv2 0/3] rebase-i: Ignore comments and blank lines among squash/fixup commands

From
Michael Haggerty <mhagger@alum.mit.edu>
Date
Jan 12, 2010, 15:38 UTC
Message-ID
<cover.1263310175.git.mhagger@alum.mit.edu>
In-Reply-To
<7vr5pw3pwp.fsf@alter.siamese.dyndns.org>

Here is v2 of the patch (now patch series) for making "rebase -i" ignore comments and blank lines while it is processing blocks of squash/fixup commands.

Please note that this version applies to "next", not "master", because it depends on some changes to t/t3404-rebase-interactive.sh that were made in mh/rebase-fixup. (This dependency is superficial and could be removed if necessary.)

The first patch in this series is not essential to the functionality but I found it useful when debugging the tests.

Michael Haggerty (3):
  lib-rebase: Provide clearer debugging info about what the editor did
  lib-rebase: Allow comments and blank lines to be added to the rebase
    script
  rebase-i: Ignore comments and blank lines in peek_next_command
 git-rebase--interactive.sh    |    2 +-
 t/lib-rebase.sh               |   26 +++++++++++++++++++-------
 t/t3404-rebase-interactive.sh |   24 ++++++++++++++++++++++++
 3 files changed, 44 insertions(+), 8 deletions(-)
Next: Johannes Schindelin
Message 1 of 6 in “[PATCHv2 0/3] rebase-i: Ignore comments and blank lines among squash/fixup commands”
  1. Michael HaggertyJan 12, 2010
  2. Johannes SchindelinJan 12, 2010
  3. 1/3 lib-rebase: Provide clearer debugging info about what the editor didMichael Haggerty, Jan 12, 2010
  4. Junio C HamanoJan 13, 2010
  5. 2/3 lib-rebase: Allow comments and blank lines to be added to the rebase scriptMichael Haggerty, Jan 12, 2010
  6. 3/3 rebase-i: Ignore comments and blank lines in peek_next_commandMichael Haggerty, Jan 12, 2010

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.