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

Re: [RFC 3/3] reset: Change the default behavior to use "--merge" during a merge

From
Andrew Wong <andrew.kw.w@gmail.com>
Date
Mar 11, 2014, 04:39 UTC
Message-ID
<531E938F.4060602@gmail.com>
In-Reply-To
<xmqqfvn538a6.fsf@gitster.dls.corp.google.com>
On 02/26/14 15:53, Junio C Hamano wrote:
>  - start warning against "reset" (no mode specifier) and "reset --mixed"
>    when the index is unmerged *and* MERGE_HEAD exists; and then

Why do we also want to check if index is unmerged? This situation can happen regardless of having conflicts or not (--no-commit, aborting the editor, etc.). As long as the user is in the middle of a merge (MERGE_HEAD exists), shouldn't they be warned if they used "git reset"?

Previous: Junio C HamanoNext: Jonathan Nieder
Message 22 of 33 in “[RFC 0/3] Make git more user-friendly during a merge conflict”
  1. Andrew WongFeb 26, 2014
  2. 1/3 wt-status: Make conflict hint message more consistent with other hintsAndrew Wong, Feb 26, 2014
  3. Jonathan NiederFeb 26, 2014
  4. Junio C HamanoFeb 26, 2014
  5. Andrew WongFeb 26, 2014
  6. 2/3 merge: Add hints to tell users about "git merge --abort"Andrew Wong, Feb 26, 2014
  7. Jonathan NiederFeb 26, 2014
  8. Andrew WongFeb 26, 2014
  9. Andrew WongMar 5, 2014
  10. Junio C HamanoMar 5, 2014
  11. Andrew WongMar 5, 2014
  12. Junio C HamanoMar 5, 2014
  13. Matthieu MoyMar 5, 2014
  14. 3/3 reset: Change the default behavior to use "--merge" during a mergeAndrew Wong, Feb 26, 2014
  15. Matthieu MoyFeb 26, 2014
  16. Andrew WongFeb 26, 2014
  17. Jonathan NiederFeb 26, 2014
  18. Andrew WongFeb 26, 2014
  19. Matthieu MoyFeb 26, 2014
  20. Andrew WongFeb 27, 2014
  21. Junio C HamanoFeb 26, 2014
  22. Andrew WongMar 11, 2014
  23. Jonathan NiederFeb 26, 2014
  24. Stephen LeakeFeb 28, 2014
  25. Charles BaileyFeb 28, 2014
  26. David KastrupFeb 28, 2014
  27. Stephen LeakeFeb 28, 2014
  28. David KastrupFeb 28, 2014
  29. Stephen LeakeFeb 28, 2014
  30. David KastrupFeb 28, 2014
  31. Stephen LeakeMar 1, 2014
  32. Matthieu MoyMar 1, 2014
  33. Stephen LeakeMar 1, 2014

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.