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>

diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt
index 3c96fa8c86c34df2dced6cd9ec8a391ee3b7208e..73008705ebe304c8d2a2d089e9328be369c50fc6 100644 (file)
--- 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.
 
        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
 
        Apply the changes introduced by the fifth and third last
        commits pointed to by master and create 2 new commits with

diff --git a/Documentation/git-revert.txt b/Documentation/git-revert.txt
index f40984d144e4ca276f84fc81a74c4ae726dcf497..752fc88e768e4b8e1afddad4bdd7833cf20978c7 100644 (file)
--- a/Documentation/git-revert.txt
+++ b/Documentation/git-revert.txt
@@ -87,7 +87,7 @@ git revert HEAD~3::
        Revert the changes specified by the fourth last commit in HEAD
        and create a new commit with the reverted changes.
 
        Revert the changes specified by the fourth last commit in HEAD
        and create a new commit with the reverted changes.
 

-git revert -n master\~5..master~2::
+git revert -n master{tilde}5..master{tilde}2::

 
        Revert the changes done by commits from the fifth last commit
        in master (included) to the third last commit in master
 
        Revert the changes done by commits from the fifth last commit
        in master (included) to the third last commit in master