Skip to content

Commit

Permalink
Documentation: Fix mark-up of lines with more than one tilde
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Junio C Hamano committed Dec 2, 2010
1 parent 47f16e8 commit be1b055
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Documentation/git-cherry-pick.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Documentation/git-revert.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.

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
Expand Down

0 comments on commit be1b055

Please sign in to comment.