зеркало из https://github.com/microsoft/git.git
Merge branch 'dl/reset-doc-no-wrt-abbrev'
Doc update. * dl/reset-doc-no-wrt-abbrev: git-reset.txt: clarify documentation
This commit is contained in:
Коммит
0b2094b06b
|
@ -428,8 +428,8 @@ working index HEAD target working index HEAD
|
||||||
|
|
||||||
`reset --merge` is meant to be used when resetting out of a conflicted
|
`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
|
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
|
involved in the merge does not have a local change with respect to the index
|
||||||
it starts, and that it writes the result out to the working tree. So if
|
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
|
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
|
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
|
resetting out from a state that a mergy operation left after failing
|
||||||
|
|
Загрузка…
Ссылка в новой задаче