* [PATCH 1/2] Documentation: cherry-pick: fix asciidoc problem with --
@ 2010-06-25 2:16 Christian Couder
0 siblings, 0 replies; only message in thread
From: Christian Couder @ 2010-06-25 2:16 UTC (permalink / raw)
To: Junio C Hamano
Cc: git, Johannes Schindelin, Sverre Rabbelier, Ramkumar Ramachandra,
Jonathan Nieder, Jeff King
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(-)
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
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2010-06-25 2:19 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-06-25 2:16 [PATCH 1/2] Documentation: cherry-pick: fix asciidoc problem with -- Christian Couder
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).