diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-04-10 02:14:20 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-10 02:14:21 +0900 |
| commit | 0b2094b06b8e810ba21348179cb71122faeb9263 (patch) | |
| tree | b3178eda42764e6e600327eee5e8c89f45b92c10 /Documentation | |
| parent | The third batch (diff) | |
| parent | git-reset.txt: clarify documentation (diff) | |
| download | tgif-0b2094b06b8e810ba21348179cb71122faeb9263.tar.xz | |
Merge branch 'dl/reset-doc-no-wrt-abbrev'
Doc update.
* dl/reset-doc-no-wrt-abbrev:
git-reset.txt: clarify documentation
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-reset.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt index 132f8e55f6..26e746c53f 100644 --- a/Documentation/git-reset.txt +++ b/Documentation/git-reset.txt @@ -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 |