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>
Junio C Hamano committed
Dec 2, 2010 at 11:23 UTC
be1b0558777dafa7b8993bc371cbe4078350e4e9
2 files changed
+2
-2
Documentation/git-cherry-pick.txt
+1
-1
@@ -92,7 +92,7 @@ git cherry-pick ^HEAD master::
92
Apply the changes introduced by all commits that are ancestors
93
of master but not of HEAD to produce new commits.
94
95
-git cherry-pick master\~4 master~2::
95
+git cherry-pick master{tilde}4 master{tilde}2::
96
97
Apply the changes introduced by the fifth and third last
98
commits pointed to by master and create 2 new commits with
Documentation/git-revert.txt
+1
-1
@@ -87,7 +87,7 @@ git revert HEAD~3::
87
Revert the changes specified by the fourth last commit in HEAD
88
and create a new commit with the reverted changes.
89
90
-git revert -n master\~5..master~2::
90
+git revert -n master{tilde}5..master{tilde}2::
91
92
Revert the changes done by commits from the fifth last commit
93
in master (included) to the third last commit in master