Skip to content

Commit 0b2094b

Browse files
committed
Merge branch 'dl/reset-doc-no-wrt-abbrev'
Doc update. * dl/reset-doc-no-wrt-abbrev: git-reset.txt: clarify documentation
2 parents 041f5ea + 56cb2d3 commit 0b2094b

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Documentation/git-reset.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -428,8 +428,8 @@ working index HEAD target working index HEAD
428428

429429
`reset --merge` is meant to be used when resetting out of a conflicted
430430
merge. Any mergy operation guarantees that the working tree file that is
431-
involved in the merge does not have local change wrt the index before
432-
it starts, and that it writes the result out to the working tree. So if
431+
involved in the merge does not have a local change with respect to the index
432+
before it starts, and that it writes the result out to the working tree. So if
433433
we see some difference between the index and the target and also
434434
between the index and the working tree, then it means that we are not
435435
resetting out from a state that a mergy operation left after failing

0 commit comments

Comments
 (0)