diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2010-08-20 05:21:53 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-20 14:16:21 -0700 |
| commit | 438ded457b6e0d1e615edd593faeeafdc8818fea (patch) | |
| tree | 8fc1f8c3e183113b0eff8e26579d317d8dbca309 | |
| parent | e860795d8a4556114a11224da246e127cbee5807 (diff) | |
| download | git-438ded457b6e0d1e615edd593faeeafdc8818fea.tar.gz git-438ded457b6e0d1e615edd593faeeafdc8818fea.tar.xz | |
Documentation: quoting trouble in "git rm" discussion
The current output (with Asciidoc 8.5.2) seems a bit broken:
given two directories ‘d` and d2, there is a difference
between using git rm 'd*’ and ‘git rm 'd/\*\’`, as the
former will also remove all of directory d2.
In other words, the markup parses as
given two directories << d` and _d2_, there is a difference
between using _git rm 'd* >>_ and << git rm 'd/\*\ >> `.
I suspect there is an asciidoc bug involved (why is ' a candidate
closing-quote mark when it is preceded by a backslash?) but with
all the meanings of ` and ' involved I do not want to track it
down. Better to use unambiguous {asterisk} and {apostrophe}
entities.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/asciidoc.conf | 1 | ||||
| -rw-r--r-- | Documentation/git-rm.txt | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf index 87a90f2c3..6be8ba325 100644 --- a/Documentation/asciidoc.conf +++ b/Documentation/asciidoc.conf @@ -17,6 +17,7 @@ caret=^ startsb=[ endsb=] tilde=~ +apostrophe=' backtick=` ifdef::backend-docbook[] diff --git a/Documentation/git-rm.txt b/Documentation/git-rm.txt index c21d19e57..d146751ca 100644 --- a/Documentation/git-rm.txt +++ b/Documentation/git-rm.txt @@ -78,7 +78,8 @@ a file that you have not told git about does not remove that file. File globbing matches across directory boundaries. Thus, given two directories `d` and `d2`, there is a difference between -using `git rm \'d\*\'` and `git rm \'d/\*\'`, as the former will +using `git rm {apostrophe}d{asterisk}{apostrophe}` and +`git rm {apostrophe}d/{asterisk}{apostrophe}`, as the former will also remove all of directory `d2`. REMOVING FILES THAT HAVE DISAPPEARED FROM THE FILESYSTEM |