summaryrefslogtreecommitdiffstats
path: root/Documentation/git-cherry-pick.txt
diff options
context:
space:
mode:
authorJean-Noël Avila <jn.avila@free.fr>2019-01-22 21:16:35 +0100
committerJunio C Hamano <gitster@pobox.com>2019-01-23 20:37:29 +0100
commitba170517be039a04b1914ebe9b492d4139c707df (patch)
treedcb778077f34381cddcb9569dab4a3eed34596e8 /Documentation/git-cherry-pick.txt
parentGit 2.20.1 (diff)
downloadgit-ba170517be039a04b1914ebe9b492d4139c707df.tar.xz
git-ba170517be039a04b1914ebe9b492d4139c707df.zip
doc: tidy asciidoc style
This mainly refers to enforcing indentation on additional lines of items of lists. Signed-off-by: Jean-Noël Avila <jn.avila@free.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-cherry-pick.txt')
-rw-r--r--Documentation/git-cherry-pick.txt14
1 files changed, 7 insertions, 7 deletions
diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt
index d35d771fc8..b8cfeec67e 100644
--- a/Documentation/git-cherry-pick.txt
+++ b/Documentation/git-cherry-pick.txt
@@ -213,16 +213,16 @@ $ git reset --merge ORIG_HEAD <3>
$ git cherry-pick -Xpatience topic^ <4>
------------
<1> apply the change that would be shown by `git show topic^`.
-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.
<2> summarize changes to be reconciled
<3> 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.
<4> try to apply the change introduced by `topic^` 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.
SEE ALSO
--------