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

Re: git reset --merge documentation improvments

From
PVPhilippe Vaucher <philippe.vaucher@gmail.com>
Date
Nov 23, 2011, 11:39 UTC
Message-ID
<CAGK7Mr4UGc3jx2AQpRK_sotWHU-ibmGz87jx4hi-==8qY04QOg@mail.gmail.com>
In-Reply-To
<4ECCB565.9020706@lyx.org>
Show 5 quoted lines
>> "Updates the files in the working tree that are different between
>> <commit>  and HEAD, but keeps those which are different between the
>> index and working tree, and finally resets the index."
>
> There is nothing to update as long as the index is not reset.

Well then I simply don't understand what --merge does. Is it like --keep but instead of failing when a file-to-be-overwritten has changes it simply ignores the overwriting and continues?

Philippe
Previous: Vincent van Ravesteijn
Message 3 of 3 in “git reset --merge documentation improvments”
  1. Philippe VaucherNov 23, 2011
  2. Vincent van RavesteijnNov 23, 2011
  3. Philippe VaucherNov 23, 2011

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.