git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: rebasing branch with reverted patches

From
FMFrancis Moreau <francis.moro@gmail.com>
Date
Apr 19, 2011, 10:21 UTC
Message-ID
<BANLkTim9vKpp6=AwSG9pkWZrw9YKCuFS9w@mail.gmail.com>
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
Previous: Santi Béjar
Message 7 of 7 in “rebasing branch with reverted patches”
  1. Francis MoreauApr 19, 2011
  2. Michael J GruberApr 19, 2011
  3. Francis MoreauApr 19, 2011
  4. Andreas EricssonApr 19, 2011
  5. Francis MoreauApr 19, 2011
  6. Santi BéjarApr 19, 2011
  7. Francis MoreauApr 19, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.