diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-02 19:23:50 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-02 19:30:35 (GMT) |
| commit | be1b0558777dafa7b8993bc371cbe4078350e4e9 (patch) | |
| tree | 4857ab73e8d0dd8d04bae99819bcd8a8cd7c858f /Documentation | |
| parent | 47f16e8b110d84bacb586a1b7183ee4bb781c980 (diff) | |
| download | git-be1b0558777dafa7b8993bc371cbe4078350e4e9.zip git-be1b0558777dafa7b8993bc371cbe4078350e4e9.tar.gz git-be1b0558777dafa7b8993bc371cbe4078350e4e9.tar.bz2 | |
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>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-cherry-pick.txt | 2 | ||||
| -rw-r--r-- | Documentation/git-revert.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt index 3c96fa8..7300870 100644 --- 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. -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 diff --git a/Documentation/git-revert.txt b/Documentation/git-revert.txt index f40984d..752fc88 100644 --- 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. -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 |