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

reset --merge documentation typo?

From
Solomon Ucko <solly.ucko@gmail.com>
Date
Jun 20, 2020, 16:15 UTC
Message-ID
<CANtMP6qbX_U_0sWtUvNQVtMboMLJshsHc=n-5eA4_XXNGEnzLQ@mail.gmail.com>
Oops, accidentally sent as HTML instead of plain text.
The documentation for `git reset --merge` states:
Show 9 quoted lines
> Resets the index and 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 (i.e. which have changes
> which have not been added).
> If a file that is different between `<commit>` and the index has
> unstaged changes, reset is aborted.
>
> In other words, `--merge` does something like a `git read-tree -u -m <commit>`,
> but carries forward unmerged index entries.
Where it says "`HEAD`", should it say "the index"?

Thanks, Solomon Ucko

Next: Junio C Hamano
Message 1 of 3 in “reset --merge documentation typo?”
  1. Solomon UckoJun 20, 2020
  2. Junio C HamanoJun 20, 2020
  3. Solomon UckoJun 20, 2020

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.