Autogenerated HTML docs for v2.20.1-519-g8fedd

1 files changed, 8 insertions, 8 deletions

diff --git a/git-cherry-pick.html b/git-cherry-pick.html
index 7cf172116..915235957 100644
--- a/git-cherry-pick.html
+++ b/git-cherry-pick.html
@@ -1132,9 +1132,9 @@ $ git cherry-pick -Xpatience topic^  <b>&lt;4&gt;</b></code></pre>
 <li>

 <p>

 apply the change that would be shown by <code>git show topic^</code>.

-In this example, the patch does not apply cleanly, so

-information about the conflict is written to the index and

-working tree and no new commit results.

+    In this example, the patch does not apply cleanly, so

+    information about the conflict is written to the index and

+    working tree and no new commit results.

 </p>

 </li>

 <li>

@@ -1145,15 +1145,15 @@ summarize changes to be reconciled
 <li>

 <p>

 cancel the cherry-pick.  In other words, return to the

-pre-cherry-pick state, preserving any local modifications you had in

-the working tree.

+    pre-cherry-pick state, preserving any local modifications

+    you had in the working tree.

 </p>

 </li>

 <li>

 <p>

 try to apply the change introduced by <code>topic^</code> again,

-spending extra time to avoid mistakes based on incorrectly matching

-context lines.

+    spending extra time to avoid mistakes based on incorrectly

+    matching context lines.

 </p>

 </li>

 </ol></div>

@@ -1176,7 +1176,7 @@ context lines.
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2018-01-26 15:11:04 PST

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

 </div>

 </div>

 </body>