Skip to content

Commit be1b055

Browse files
committed
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 <[email protected]> Helped-by: Jonathan Nieder <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 47f16e8 commit be1b055

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Documentation/git-cherry-pick.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ git cherry-pick ^HEAD master::
9292
Apply the changes introduced by all commits that are ancestors
9393
of master but not of HEAD to produce new commits.
9494

95-
git cherry-pick master\~4 master~2::
95+
git cherry-pick master{tilde}4 master{tilde}2::
9696

9797
Apply the changes introduced by the fifth and third last
9898
commits pointed to by master and create 2 new commits with

Documentation/git-revert.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ git revert HEAD~3::
8787
Revert the changes specified by the fourth last commit in HEAD
8888
and create a new commit with the reverted changes.
8989

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

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

0 commit comments

Comments
 (0)