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

Re: unmerging feature branches

From
Linus Torvalds <torvalds@linux-foundation.org>
Date
Oct 23, 2007, 19:49 UTC
Message-ID
<alpine.LFD.0.999.0710231247301.30120@woody.linux-foundation.org>
In-Reply-To
<7vir4x7hiu.fsf@gitster.siamese.dyndns.org>
On Tue, 23 Oct 2007, Junio C Hamano wrote:
Show 5 quoted lines
> 
> Desire to revert an octopus would, as you demonstrated, often be
> to revert only one arm, but I think allowing to revert a twohead
> merge should be trivial.  If we define "reverting a merge" to
> always revert all arms, then this should suffice.

The only reason I don't like this is that it kind of assumes that the mainline is the first parent.

Maybe I'd like to revert a merge, but I want to revert a merge that somebody *else* did, and maybe it was the first-hand parent I don't like.

Those kinds of issues don't exist with non-merge commits: there's never any question "which side" to revert.

			Linus
Previous: Junio C HamanoNext: Junio C Hamano
Message 15 of 16 in “unmerging feature branches”
  1. martin f krafftOct 23, 2007
  2. Matthieu MoyOct 23, 2007
  3. Linus TorvaldsOct 23, 2007
  4. martin f krafftOct 23, 2007
  5. Linus TorvaldsOct 23, 2007
  6. martin f krafftOct 23, 2007
  7. Linus TorvaldsOct 23, 2007
  8. martin f krafftOct 23, 2007
  9. Linus TorvaldsOct 23, 2007
  10. Linus TorvaldsOct 23, 2007
  11. Alejandro Martinez RuizOct 31, 2007
  12. martin f krafftOct 31, 2007
  13. Linus TorvaldsOct 31, 2007
  14. Junio C HamanoOct 23, 2007
  15. Linus TorvaldsOct 23, 2007
  16. revert/cherry-pick: work on merge commits as wellJunio C Hamano, Oct 23, 2007

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.