From: Francis Moreau <francis.moro@gmail.com>
To: "Santi Béjar" <santi@agolina.net>
Cc: Michael J Gruber <git@drmicha.warpmail.net>, git@vger.kernel.org
Subject: Re: rebasing branch with reverted patches
Date: Tue, 19 Apr 2011 12:21:45 +0200 [thread overview]
Message-ID: <BANLkTim9vKpp6=AwSG9pkWZrw9YKCuFS9w@mail.gmail.com> (raw)
In-Reply-To: <BANLkTim_QNFhChme=nxGf1_Dw8LedTS3Ag@mail.gmail.com>
Hello,
On Tue, Apr 19, 2011 at 11:39 AM, Santi Béjar <santi@agolina.net> wrote:
>
> 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.
Interesting I wasn't aware of --autosquash option, thanks.
This is almost what I was asking for actually, the only part which is
missing is the fact that git-rebase detect the "Revert: " magic
string, check that the revert is sane (by comparing the diff of the
revert with the diff of the original commit) and do the same as
"fixup!" would do without the confusion of the resulting empty commit.
Thanks
--
Francis
prev parent reply other threads:[~2011-04-19 10:21 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
2011-04-19 10:21 ` Francis Moreau [this message]
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='BANLkTim9vKpp6=AwSG9pkWZrw9YKCuFS9w@mail.gmail.com' \
--to=francis.moro@gmail.com \
--cc=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=santi@agolina.net \
/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).