git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sylvain Rabot <sylvain@abstraction.fr>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
	Sylvain Rabot <sylvain.rabot@f-secure.com>,
	Jonathan Nieder <jrnieder@gmail.com>,
	Sylvain Rabot <sylvain@abstraction.fr>
Subject: [PATCH] documentation: replace wrongly evalutated backslashed '~' characters
Date: Thu,  2 Dec 2010 20:15:24 +0100	[thread overview]
Message-ID: <1291317324-19594-1-git-send-email-sylvain@abstraction.fr> (raw)
In-Reply-To: <7vzksoqbjd.fsf@alter.siamese.dyndns.org>

Sometimes when there is more than one '~' on a line
it gets evaluated even if being backslashed and cause
'~' characters to be removed in the man pages.

Signed-off-by: Sylvain Rabot <sylvain@abstraction.fr>
---
 Documentation/git-cherry-pick.txt |    2 +-
 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
-- 
1.7.3.2

  parent reply	other threads:[~2010-12-02 19:15 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-12-02 17:36 [PATCH] documentation: escape '~' in git revert Sylvain Rabot
2010-12-02 17:50 ` Jonathan Nieder
2010-12-02 18:23   ` Junio C Hamano
2010-12-02 18:32     ` Jonathan Nieder
2010-12-02 19:23       ` Junio C Hamano
2010-12-02 19:15     ` Sylvain Rabot [this message]
2010-12-02 18:05 ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1291317324-19594-1-git-send-email-sylvain@abstraction.fr \
    --to=sylvain@abstraction.fr \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jrnieder@gmail.com \
    --cc=sylvain.rabot@f-secure.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).