From: Solomon Ucko <solly.ucko@gmail.com>
Date: Sat, 20 Jun 2020 16:15:54 GMT
Subject: reset --merge documentation typo?
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:

> 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