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

Re: [PATCH] Make git revert warn the user when reverting a merge commit.

From
Junio C Hamano <gitster@pobox.com>
Date
Dec 21, 2008, 10:59 UTC
Message-ID
<7v8wq9rdyl.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<200812211109.36788.robin.rosenberg.lists@dewire.com>
Robin Rosenberg <robin.rosenberg.lists@dewire.com> writes:
> One could consider keeping the contributions from ^1 a special case and not
> mention the parent, making it look like any revert commit. I guess most merge
> reverts are like this in practice.

I think that makes sense. There are cases where the mainline maintainer punts a merge and pass the baton to a subsystem maintainer, saying "Your tree has many conflicts with my tip, and I'd rather ask you to resolve it" (and after such a merge, the mainline maintainer will fast forward to the result), in which case the merge will be in the reverse direction, but that should be rare. Reverting such a merge later from the mainline's point of view would involve "revert -m 2".

So if your patch is tightened a bit to record extra information only in such a case, I think that would be an acceptable approach to the issue.

Previous: Robin RosenbergNext: Boyd Stephen Smith Jr.
Message 16 of 24 in “Make git revert warn the user when reverting a merge commit.”
  1. Make git revert warn the user when reverting a merge commit.Boyd Stephen Smith Jr., Dec 19, 2008
  2. Johannes SchindelinDec 19, 2008
  3. Junio C HamanoDec 19, 2008
  4. Boyd Stephen Smith Jr.Dec 19, 2008
  5. Jay SoffianDec 19, 2008
  6. Boyd Stephen Smith Jr.Dec 19, 2008
  7. Junio C HamanoDec 19, 2008
  8. AlanDec 19, 2008
  9. Boyd Stephen Smith Jr.Dec 19, 2008
  10. Robin RosenbergDec 20, 2008
  11. Boyd Stephen Smith Jr.Dec 20, 2008
  12. Robin RosenbergDec 20, 2008
  13. Junio C HamanoDec 21, 2008
  14. Boyd Stephen Smith Jr.Dec 21, 2008
  15. Robin RosenbergDec 21, 2008
  16. Junio C HamanoDec 21, 2008
  17. Boyd Stephen Smith Jr.Dec 21, 2008
  18. Junio C HamanoDec 21, 2008
  19. Boyd Stephen Smith Jr.Dec 21, 2008
  20. Junio C HamanoDec 21, 2008
  21. Junio C HamanoDec 21, 2008
  22. Robin RosenbergDec 21, 2008
  23. Junio C HamanoDec 21, 2008
  24. Robin RosenbergDec 21, 2008

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.