From: Michael Haggerty <mhagger@alum.mit.edu>
To: git@vger.kernel.org
Cc: gitster@pobox.com, Johannes.Schindelin@gmx.de,
Michael Haggerty <mhagger@alum.mit.edu>
Subject: [PATCHv2 0/3] rebase-i: Ignore comments and blank lines among squash/fixup commands
Date: Tue, 12 Jan 2010 16:38:33 +0100 [thread overview]
Message-ID: <cover.1263310175.git.mhagger@alum.mit.edu> (raw)
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 parent reply other threads:[~2010-01-12 15:39 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <7vr5pw3pwp.fsf@alter.siamese.dyndns.org>
2010-01-12 15:38 ` Michael Haggerty [this message]
2010-01-12 15:38 ` [PATCHv2 1/3] lib-rebase: Provide clearer debugging info about what the editor did Michael Haggerty
2010-01-13 6:55 ` Junio C Hamano
2010-01-12 15:38 ` [PATCHv2 2/3] lib-rebase: Allow comments and blank lines to be added to the rebase script Michael Haggerty
2010-01-12 15:38 ` [PATCHv2 3/3] rebase-i: Ignore comments and blank lines in peek_next_command Michael Haggerty
2010-01-12 16:37 ` [PATCHv2 0/3] rebase-i: Ignore comments and blank lines among squash/fixup commands Johannes Schindelin
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=cover.1263310175.git.mhagger@alum.mit.edu \
--to=mhagger@alum.mit.edu \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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 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 NNTP newsgroup(s).