From: Jonathan Nieder <jrnieder@gmail.com>
To: Marc Branchaud <marcnarc@xiplink.com>
Cc: Junio C Hamano <gitster@pobox.com>,
git@vger.kernel.org, Johannes Sixt <j.sixt@viscovery.net>
Subject: Re: [PATCH] Test that the 'rebase -i' "reword" command always cherry-picks a commit.
Date: Tue, 23 Mar 2010 14:16:03 -0500 [thread overview]
Message-ID: <20100323191603.GB1382@progeny.tock> (raw)
In-Reply-To: <4BA8D263.8040602@xiplink.com>
Marc Branchaud wrote:
> Junio C Hamano wrote:
>> "rebase -i --no-ff"
>> already exists, and is probably a more natural way to do this than saying
>> "reword" but not rewording anything, no?
>>
>> I would actually say "rebase -f P" would be even easier and clearer,
>> especially as...
[...]
> I was confused about the purpose of "rebase -f". Jonathan Nieder even
> pointed me to it when I posted my original patch for "rebase -i --no-ff", but
> the description in the man page threw me:
>
> Force the rebase even if the current branch is a descendant of
> the commit you are rebasing onto. Normally the command will
> exit with the message "Current branch is up to date" in such a
> situation.
>
> I didn't realize that this is exactly the situation that "rebase -i" normally
> deals with (-i basically implies -f), and that "rebase -f" would do exactly
> what I wanted "rebase -i --no-ff" to do.
Yes, sorry for not following up on that comment. The point is that
rebase without --interactive never fast-forwards. So if you do not need
to edit your branch interactively, it should work for your purpose.
> But I think I see an approach that might make sense:
>
> - Teach "rebase -i" to recognize the -f parameter (instead of --no-ff).
I like --no-ff better. :)
> - Update rebase's man page to better explain -f.
While at it, I should mention another documentation problem: rebase’s
man page does not explain that rebase --interactive will fast-forward at
the beginning of the series. It should say that rebase -i will do that
and rebase without -i will not. I can prepare a patch to fix it this
evening.
> - Update revert-a-faulty-merge.txt to explain how to use "rebase [-i] -f".
Sounds interesting. Simpler to use "rebase (-f | -i --no-ff)", I think.
Or maybe rebase could learn a no-op --no-ff option to make it easier to
switch between it and rebase -i, and this would become
"rebase (-f | -i) --no-ff".
Jonathan
next prev parent reply other threads:[~2010-03-23 19:16 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 ` [PATCHv4 0/2] Teach the --no-ff " Marc Branchaud
2010-03-24 17:13 ` 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 ` Jonathan Nieder [this message]
2010-03-22 22:09 ` [PATCH] Test that the 'rebase -i' "reword" command always cherry-picks a commit 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=20100323191603.GB1382@progeny.tock \
--to=jrnieder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j.sixt@viscovery.net \
--cc=marcnarc@xiplink.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).