Autogenerated HTML docs for v2.20.1-519-g8fedd

1 files changed, 36 insertions, 36 deletions

diff --git a/git-reset.html b/git-reset.html
index 77b864fdb..9ed231ec9 100644
--- a/git-reset.html
+++ b/git-reset.html
@@ -917,9 +917,9 @@ $ git pull git://info.example.com/ nitfol  <b>&lt;4&gt;</b></code></pre>
 <li>

 <p>

 You are happily working on something, and find the changes

-in these files are in good order.  You do not want to see them

-when you run <code>git diff</code>, because you plan to work on other files

-and changes with these files are distracting.

+    in these files are in good order.  You do not want to see them

+    when you run <code>git diff</code>, because you plan to work on other files

+    and changes with these files are distracting.

 </p>

 </li>

 <li>

@@ -930,16 +930,16 @@ Somebody asks you to pull, and the changes sound worthy of merging.
 <li>

 <p>

 However, you already dirtied the index (i.e. your index does

-not match the <code>HEAD</code> commit).  But you know the pull you are going

-to make does not affect <code>frotz.c</code> or <code>filfre.c</code>, so you revert the

-index changes for these two files.  Your changes in working tree

-remain there.

+    not match the <code>HEAD</code> commit).  But you know the pull you are going

+    to make does not affect <code>frotz.c</code> or <code>filfre.c</code>, so you revert the

+    index changes for these two files.  Your changes in working tree

+    remain there.

 </p>

 </li>

 <li>

 <p>

 Then you can pull and merge, leaving <code>frotz.c</code> and <code>filfre.c</code>

-changes still in the working tree.

+    changes still in the working tree.

 </p>

 </li>

 </ol></div>

@@ -959,8 +959,8 @@ $ git commit -a -c ORIG_HEAD  <b>&lt;3&gt;</b></code></pre>
 <li>

 <p>

 This is most often done when you remembered what you

-just committed is incomplete, or you misspelled your commit

-message, or both.  Leaves working tree as it was before "reset".

+    just committed is incomplete, or you misspelled your commit

+    message, or both.  Leaves working tree as it was before "reset".

 </p>

 </li>

 <li>

@@ -971,8 +971,8 @@ Make corrections to working tree files.
 <li>

 <p>

 "reset" copies the old head to <code>.git/ORIG_HEAD</code>; redo the

-commit by starting with its log message.  If you do not need to

-edit the message further, you can give <code>-C</code> option instead.

+    commit by starting with its log message.  If you do not need to

+    edit the message further, you can give <code>-C</code> option instead.

 </p>

 <div class="paragraph"><p>See also the <code>--amend</code> option to <a href="git-commit.html">git-commit(1)</a>.</p></div>

 </li>

@@ -992,9 +992,9 @@ $ git checkout topic/wip   <b>&lt;3&gt;</b></code></pre>
 <li>

 <p>

 You have made some commits, but realize they were premature

-to be in the <code>master</code> branch.  You want to continue polishing

-them in a topic branch, so create <code>topic/wip</code> branch off of the

-current <code>HEAD</code>.

+    to be in the <code>master</code> branch.  You want to continue polishing

+    them in a topic branch, so create <code>topic/wip</code> branch off of the

+    current <code>HEAD</code>.

 </p>

 </li>

 <li>

@@ -1022,10 +1022,10 @@ $ git reset --hard HEAD~3   <b>&lt;1&gt;</b></code></pre>
 <li>

 <p>

 The last three commits (<code>HEAD</code>, <code>HEAD^</code>, and <code>HEAD~2</code>) were bad

-and you do not want to ever see them again.  Do <strong>not</strong> do this if

-you have already given these commits to somebody else.  (See the

-"RECOVERING FROM UPSTREAM REBASE" section in <a href="git-rebase.html">git-rebase(1)</a> for

-the implications of doing so.)

+    and you do not want to ever see them again.  Do <strong>not</strong> do this if

+    you have already given these commits to somebody else.  (See the

+    "RECOVERING FROM UPSTREAM REBASE" section in <a href="git-rebase.html">git-rebase(1)</a>

+    for the implications of doing so.)

 </p>

 </li>

 </ol></div>

@@ -1050,30 +1050,30 @@ $ git reset --hard ORIG_HEAD       <b>&lt;4&gt;</b></code></pre>
 <li>

 <p>

 Try to update from the upstream resulted in a lot of

-conflicts; you were not ready to spend a lot of time merging

-right now, so you decide to do that later.

+    conflicts; you were not ready to spend a lot of time merging

+    right now, so you decide to do that later.

 </p>

 </li>

 <li>

 <p>

 "pull" has not made merge commit, so <code>git reset --hard</code>

-which is a synonym for <code>git reset --hard HEAD</code> clears the mess

-from the index file and the working tree.

+    which is a synonym for <code>git reset --hard HEAD</code> clears the mess

+    from the index file and the working tree.

 </p>

 </li>

 <li>

 <p>

 Merge a topic branch into the current branch, which resulted

-in a fast-forward.

+    in a fast-forward.

 </p>

 </li>

 <li>

 <p>

 But you decided that the topic branch is not ready for public

-consumption yet.  "pull" or "merge" always leaves the original

-tip of the current branch in <code>ORIG_HEAD</code>, so resetting hard to it

-brings your index file and the working tree back to that state,

-and resets the tip of the branch to that commit.

+    consumption yet.  "pull" or "merge" always leaves the original

+    tip of the current branch in <code>ORIG_HEAD</code>, so resetting hard to it

+    brings your index file and the working tree back to that state,

+    and resets the tip of the branch to that commit.

 </p>

 </li>

 </ol></div>

@@ -1095,18 +1095,18 @@ $ git reset --merge ORIG_HEAD      <b>&lt;2&gt;</b></code></pre>
 <li>

 <p>

 Even if you may have local modifications in your

-working tree, you can safely say <code>git pull</code> when you know

-that the change in the other branch does not overlap with

-them.

+    working tree, you can safely say <code>git pull</code> when you know

+    that the change in the other branch does not overlap with

+    them.

 </p>

 </li>

 <li>

 <p>

 After inspecting the result of the merge, you may find

-that the change in the other branch is unsatisfactory.  Running

-<code>git reset --hard ORIG_HEAD</code> will let you go back to where you

-were, but it will discard your local changes, which you do not

-want.  <code>git reset --merge</code> keeps your local changes.

+    that the change in the other branch is unsatisfactory.  Running

+    <code>git reset --hard ORIG_HEAD</code> will let you go back to where you

+    were, but it will discard your local changes, which you do not

+    want.  <code>git reset --merge</code> keeps your local changes.

 </p>

 </li>

 </ol></div>

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

 <div id="footer-text">

 Last updated

- 2018-12-01 06:35:58 PST

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

 </div>

 </div>

 </body>