Autogenerated HTML docs for v2.21.0-313-ge35b8

1 files changed, 3 insertions, 3 deletions

diff --git a/git-reset.html b/git-reset.html
index 9ed231ec9..08cf3990e 100644
--- a/git-reset.html
+++ b/git-reset.html
@@ -1393,8 +1393,8 @@ in state <code>D</code>).</p></div>
 </div></div>

 <div class="paragraph"><p><code>reset --merge</code> 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

@@ -1443,7 +1443,7 @@ entries:</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2019-02-05 15:33:20 PST

+ 2019-04-10 02:54:14 JST

 </div>

 </div>

 </body>