mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Documentation: Fix mark-up of lines with more than one tilde

Browse Source 
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>
This commit is contained in:
Junio C Hamano
2010-12-02 11:23:50 -08:00
parent 47f16e8b11
commit be1b055877
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/git-cherry-pick.txt
View File

@ -92,7 +92,7 @@ git cherry-pick ^HEAD master::
Apply the changes introduced by all commits that are ancestors Apply the changes introduced by all commits that are ancestors
of master but not of HEAD to produce new commits. 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 Apply the changes introduced by the fifth and third last
commits pointed to by master and create 2 new commits with commits pointed to by master and create 2 new commits with

2
Documentation/git-revert.txt
View File

@ -87,7 +87,7 @@ git revert HEAD~3::
Revert the changes specified by the fourth last commit in HEAD Revert the changes specified by the fourth last commit in HEAD
and create a new commit with the reverted changes. 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 Revert the changes done by commits from the fifth last commit
in master (included) to the third last commit in master in master (included) to the third last commit in master