From: Junio C Hamano <gitster@pobox.com>
To: Marc Branchaud <marcnarc@xiplink.com>
Cc: git@vger.kernel.org, Johannes Sixt <j.sixt@viscovery.net>,
Jonathan Nieder <jrnieder@gmail.com>
Subject: Re: [PATCH] Test that the 'rebase -i' "reword" command always cherry-picks a commit.
Date: Mon, 22 Mar 2010 13:46:38 -0700 [thread overview]
Message-ID: <7vd3yw84pd.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <1269285942-17496-1-git-send-email-marcnarc@xiplink.com> (Marc Branchaud's message of "Mon\, 22 Mar 2010 15\:25\:42 -0400")
Marc Branchaud <marcnarc@xiplink.com> writes:
> In particular, "reword" should cherry-pick a reworded commit even if the
> commit's message is unchanged.
>
> This behaviour provides a way to deal with a situation that can arise when
> a merge had to be reverted. Added an addendum to revert-a-faulty-merge.txt
> describing the situation and how to use "reword" to handle it.
> ---
>
> Is this more acceptable than adding --no-ff to rebase--interactive?
>
> I wasn't sure how to integrate the new text into revert-a-faulty-merge.txt.
> I went with an addendum, but I'm open to other approaches.
The addendum looked readable, but I am a bit puzzled. "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...
> ...
> +However, you could avoid these problems if you recreated the entire branch,
> +including commit A:
> +
> + P---o---o---M---x---x---W---x
> + |\ /
> + | A---B---C <-- old branch
> + \
> + A'---B'---C' <-- entirely recreated branch
> +
> +Now you can merge A'-B'-C' into the mainline branch without worrying about
> +first reverting W.
> +
> +But if you don't actually need to change commit A, then you need some way to
> +recreate it as a new commit with the same changes in it.
... this part seems to talk about working around the tendency of 'rebase -i'
to fast-forward.
next prev parent reply other threads:[~2010-03-22 20:47 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 [this message]
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 ` [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=7vd3yw84pd.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=j.sixt@viscovery.net \
--cc=jrnieder@gmail.com \
--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).