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

Re: [RFC/PATCH] git-reset to remove "$GIT_DIR/MERGE_MSG"

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Dec 5, 2006, 08:22 UTC
Message-ID
<Pine.LNX.4.63.0612050847340.28348@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To
<7v4psbknvb.fsf@assigned-by-dhcp.cox.net>
Hi,
On Mon, 4 Dec 2006, Junio C Hamano wrote:
>  * Marked as RFC because I suspect I am missing a valid use case
>    where a user might want to say "reset" as part of continuing
>    the conflicted merge resolution, although I do not think of
>    any offhand...

I can only speak for myself, of course: When I use git-reset in a merge, more often than not I use "--hard", in which case I want to try something different. So yes, I like this patch.

The only possible exception I can think of: git-reset --mixed when a merge failed.

Ciao, Dscho

Previous: Luben TuikovNext: Andreas Ericsson
Message 3 of 5 in “git-reset to remove "$GIT_DIR/MERGE_MSG"”
  1. git-reset to remove "$GIT_DIR/MERGE_MSG"Junio C Hamano, Dec 5, 2006
  2. Luben TuikovDec 5, 2006
  3. Johannes SchindelinDec 5, 2006
  4. Andreas EricssonDec 5, 2006
  5. Johannes SchindelinDec 5, 2006

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.