From: Marc Branchaud <marcnarc@xiplink.com>
To: git@vger.kernel.org
Cc: Johannes Sixt <j.sixt@viscovery.net>,
Jonathan Nieder <jrnieder@gmail.com>,
Junio C Hamano <gitster@pobox.com>
Subject: [PATCHv4 0/2] Teach the --no-ff option to 'rebase -i'.
Date: Wed, 24 Mar 2010 11:40:59 -0400 [thread overview]
Message-ID: <1269445261-2941-1-git-send-email-marcnarc@xiplink.com> (raw)
In-Reply-To: <7vzl1yd5j4.fsf@alter.siamese.dyndns.org>
Thanks to both Junio and Jonathan for your patience in working through this.
Junio, I think I see what you mean. I like teaching --no-ff to 'rebase -i'
because it allows me to combine two commands into one for this situation.
I've split this work into two patches:
The first one simply teaches "rebase -i" to accept and ignore -f. I feel
this is better than adding text to the man page explaining why interactive
rebase has --no-ff but not -f, while non-interactive has the opposite.
The second is a re-roll of the --no-ff patch. The only significant
differences are in the documentation:
- The rebase man page mentions reverting a merge under both the -f and
--no-ff options.
- Rewrote the last 3 paragraphs of the revert-a-faulty-merge.txt howto
(starting at "But if you don't ...").
I'm wondering now if it would make sense to also teach non-interactive
rebase to accept --no-ff as a synonym for -f. Thoughts?
M.
Documentation/git-rebase.txt | 23 +++++++++-
Documentation/howto/revert-a-faulty-merge.txt | 61 +++++++++++++++++++++++++
git-rebase--interactive.sh | 13 +++++-
t/t3404-rebase-interactive.sh | 36 +++++++++++++--
4 files changed, 125 insertions(+), 8 deletions(-)
next prev parent reply other threads:[~2010-03-24 15:56 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-16 16:08 [PATCH] Teach --no-ff option to 'rebase -i' Marc Branchaud
2010-03-16 19:19 ` Marc Branchaud
2010-03-16 19:42 ` [PATCHv2] " Marc Branchaud
2010-03-16 21:47 ` Jonathan Nieder
2010-03-17 6:59 ` Johannes Sixt
2010-03-17 15:58 ` Peter Baumann
2010-03-17 16:07 ` Johannes Sixt
2010-03-17 18:42 ` Peter Baumann
2010-03-18 7:08 ` Johannes Sixt
2010-03-18 8:03 ` Peter Baumann
2010-03-17 16:03 ` Marc Branchaud
2010-03-17 16:19 ` Johannes Sixt
2010-03-17 18:10 ` Marc Branchaud
2010-03-22 19:25 ` [PATCH] Test that the 'rebase -i' "reword" command always cherry-picks a commit Marc Branchaud
2010-03-22 20:23 ` Avery Pennarun
2010-03-22 22:06 ` Marc Branchaud
2010-03-22 20:46 ` Junio C Hamano
2010-03-23 14:38 ` Marc Branchaud
2010-03-23 16:19 ` [PATCHv3] Teach -f/--force-rebase option to 'rebase -i' Marc Branchaud
2010-03-23 22:42 ` Junio C Hamano
2010-03-24 15:40 ` Marc Branchaud [this message]
2010-03-24 17:13 ` [PATCHv4 0/2] Teach the --no-ff " Junio C Hamano
2010-03-24 20:34 ` [PATCHv5] Teach rebase the --no-ff option Marc Branchaud
2010-03-24 21:45 ` Junio C Hamano
2010-03-24 15:41 ` [PATCH 1/2] Teach 'rebase -i' to accept and ignore the -f/--force-rebase option Marc Branchaud
2010-03-24 15:41 ` [PATCH 2/2] Teach the --no-ff option to 'rebase -i' Marc Branchaud
2010-03-24 19:06 ` Junio C Hamano
2010-03-23 19:16 ` [PATCH] Test that the 'rebase -i' "reword" command always cherry-picks a commit Jonathan Nieder
2010-03-22 22:09 ` Jonathan Nieder
2010-03-17 15:56 ` [PATCHv2] Teach --no-ff option to 'rebase -i' Marc Branchaud
2010-03-17 17:53 ` Jonathan Nieder
2010-03-17 18:13 ` Jonathan Nieder
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=1269445261-2941-1-git-send-email-marcnarc@xiplink.com \
--to=marcnarc@xiplink.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j.sixt@viscovery.net \
--cc=jrnieder@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).