aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-cherry-pick.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-12-02 11:23:50 -0800
committerJunio C Hamano <gitster@pobox.com>2010-12-02 11:30:35 -0800
commitbe1b0558777dafa7b8993bc371cbe4078350e4e9 (patch)
tree4857ab73e8d0dd8d04bae99819bcd8a8cd7c858f /Documentation/git-cherry-pick.txt
parent47f16e8b110d84bacb586a1b7183ee4bb781c980 (diff)
downloadgit-be1b0558777dafa7b8993bc371cbe4078350e4e9.tar.gz
git-be1b0558777dafa7b8993bc371cbe4078350e4e9.tar.xz
Documentation: Fix mark-up of lines with more than one tilde
The manual pages of cherry-pick and revert had examples with two revisions on the same line in the examples section, that looked like this: git cherry-pick master~4 master~2:: Unfortunately, this is taken as a mark-up to make the part between two tildes, "4 master", subscript. Use {tilde} to make it explicit that we do want ~ characters in these places (backslash does not help). Reported-by: Sylvain Rabot <sylvain.rabot@f-secure.com> Helped-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-cherry-pick.txt')
-rw-r--r--Documentation/git-cherry-pick.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt
index 3c96fa8c8..73008705e 100644
--- a/Documentation/git-cherry-pick.txt
+++ b/Documentation/git-cherry-pick.txt
@@ -92,7 +92,7 @@ git cherry-pick ^HEAD master::
Apply the changes introduced by all commits that are ancestors
of master but not of HEAD to produce new commits.
-git cherry-pick master\~4 master~2::
+git cherry-pick master{tilde}4 master{tilde}2::
Apply the changes introduced by the fifth and third last
commits pointed to by master and create 2 new commits with