mirror of
https://github.com/git/git.git
synced 2024-10-30 22:07:53 +01:00
git-reset.txt: clarify documentation
git-reset.txt contained a missing "a" and "wrt". Fix the missing "a" for correctness and replace "wrt" with "with respect to" so that the documentation is not so cryptic. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
0d0ac3826a
commit
56cb2d30f8
1 changed files with 2 additions and 2 deletions
|
@ -428,8 +428,8 @@ working index HEAD target working index HEAD
|
|||
|
||||
`reset --merge` is meant to be used when resetting out of a conflicted
|
||||
merge. Any mergy operation guarantees that the working tree file that is
|
||||
involved in the merge does not have local change wrt the index before
|
||||
it starts, and that it writes the result out to the working tree. So if
|
||||
involved in the merge does not have a local change with respect to the index
|
||||
before it starts, and that it writes the result out to the working tree. So if
|
||||
we see some difference between the index and the target and also
|
||||
between the index and the working tree, then it means that we are not
|
||||
resetting out from a state that a mergy operation left after failing
|
||||
|
|
Loading…
Reference in a new issue