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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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@xxxxxxxxxxxxx>
---

	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(-)

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


--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]