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

Re: unmerging feature branches

From
Matthieu Moy <matthieu.moy@imag.fr>
Date
Oct 23, 2007, 16:19 UTC
Message-ID
<vpqejflolb5.fsf@bauges.imag.fr>
In-Reply-To
<20071023152445.GA10070@piper.oerlikon.madduck.net>
martin f krafft <madduck@madduck.net> writes:
> Now I woul like to undo the merge.

Dirty solution: export the patch corresponding to the merge (diff M..M^), and apply it on master. If you have no conflicts, it should be doable. If you have conflicts, it will probably be painfull.

-- 
Matthieu
Previous: martin f krafftNext: Linus Torvalds
Message 2 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.