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, 09:03 UTC
Message-ID
<Pine.LNX.4.63.0612051000280.28348@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To
<45752F8E.9020405@op5.se>
Hi,
On Tue, 5 Dec 2006, Andreas Ericsson wrote:
Show 7 quoted lines
> Johannes Schindelin wrote:
> > 
> > The only possible exception I can think of: git-reset --mixed when a merge
> > failed.
> 
> Indeed, but any invocation of git-reset means you'll quite likely have 
> to re-do the merge to get all changes anyways.

But the working directory still contains the changes (and conflicts) with --mixed. A valid workflow would then be to compare to the index directly, instead of having to ask "git diff --ours" all the time. And if I'm not mistaken, a commit (after cleaning up the conflicts) would not record the merge as a merge.

Ciao, Dscho

Previous: Andreas Ericsson
Message 5 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.