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

Re: rebasing branch with reverted patches

From
Michael J Gruber <git@drmicha.warpmail.net>
Date
Apr 19, 2011, 08:42 UTC
Message-ID
<4DAD4B0F.9030908@drmicha.warpmail.net>
In-Reply-To
<BANLkTim5mf6okFN8V5V+B=Ns1JORD47a5A@mail.gmail.com>
Francis Moreau venit, vidit, dixit 19.04.2011 09:32:
Show 14 quoted lines
> 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).

Michael
Previous: Francis MoreauNext: Francis Moreau
Message 2 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.