From: "Santi Béjar" <santi@agolina.net>
To: Francis Moreau <francis.moro@gmail.com>
Cc: Michael J Gruber <git@drmicha.warpmail.net>, git@vger.kernel.org
Subject: Re: rebasing branch with reverted patches
Date: Tue, 19 Apr 2011 11:39:24 +0200 [thread overview]
Message-ID: <BANLkTim_QNFhChme=nxGf1_Dw8LedTS3Ag@mail.gmail.com> (raw)
In-Reply-To: <BANLkTimbSes-B8zK2a2t1Jp1v+29HdNvqw@mail.gmail.com>
On Tue, Apr 19, 2011 at 11:09 AM, Francis Moreau <francis.moro@gmail.com> wrote:
> On Tue, Apr 19, 2011 at 10:42 AM, Michael J Gruber
> <git@drmicha.warpmail.net> wrote:
>> Francis Moreau venit, vidit, dixit 19.04.2011 09:32:
>>> Hello,
>>>
>>> I'm wondering if it would be a good idea for git rebase to allow not
>>> rebasing reverted patch which are part of the rebased branch.
>>>
>>> For example I'm currently rebasing my branch 'devel' onto master. This
>>> branch have several commits and specially one called A and another one
>>> called A' which reverts A.
>>>
>>> When rebasing 'devel' branch, rebase could try to drop both A and A'.
>>>
>>> What do you think ?
>>>
>>> BTW is there a way to do this currently ?
>>
>> You can do this with "rebase -i" by removing A and A' from the commit
>> list (or squashing them or dealing with them in whatever way you like).
>
> Of course, but my point was to make this automatically...
You can also change the A' commit title to "fixup! original_title"
while reverting (there is no --fixup argument like "git commit" has),
then git rebase -i would reorder the todo file for you.
git revert gets confused by the resulting empty change but you can
"git rebase --continue", or now that both are next to the other just
remove them.
HTH,
Santi
next prev parent reply other threads:[~2011-04-19 9:46 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-19 7:32 rebasing branch with reverted patches Francis Moreau
2011-04-19 8:42 ` Michael J Gruber
2011-04-19 9:09 ` Francis Moreau
2011-04-19 9:15 ` Andreas Ericsson
2011-04-19 9:19 ` Francis Moreau
2011-04-19 9:39 ` Santi Béjar [this message]
2011-04-19 10:21 ` Francis Moreau
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='BANLkTim_QNFhChme=nxGf1_Dw8LedTS3Ag@mail.gmail.com' \
--to=santi@agolina.net \
--cc=francis.moro@gmail.com \
--cc=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
/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).