threads / patch / 24192

patch, 2 partsDocumentation: cherry-pick: fix asciidoc problem with --

Subject: [PATCH 1/2] Documentation: cherry-pick: fix asciidoc problem with --

## tl;dr

One message between Jun 25, 2010 and Jun 25, 2010. Diffs are folded; open one to read it.

replies: 0people: 1as markdown or json

Christian Couder· Jun 25, 2010, 02:16 UTC · lore

Asciidoc interprets two dashes separated by spaces as a single big dash. So let's escape the first dash, so that "master \-- README" will properly appear as "master -- README".

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
	This patch should be squashed into patch 2/3 in the
	cc/cherry-pick-stdin series.
 Documentation/git-cherry-pick.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Show changes to Documentation/git-cherry-pick.txt +1 −1
diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt
index f047739..ca485db 100644
--- a/Documentation/git-cherry-pick.txt
+++ b/Documentation/git-cherry-pick.txt
@@ -113,7 +113,7 @@ git cherry-pick --ff ..next::
 	are in next but not HEAD to the current branch, creating a new
 	commit for each new change.
 
-git rev-list --reverse master -- README | git cherry-pick -n --stdin::
+git rev-list --reverse master \-- README | git cherry-pick -n --stdin::
 
 	Apply the changes introduced by all commits on the master
 	branch that touched README to the working tree and index,
-- 
1.7.1.642.gc3eb1

← back to recent threads