{"thread":{"id":"1771","subject":"[PATCH] Escape asciidoc's built-in em-dash replacement","startedAt":"2005-09-11T17:29:10Z","lastAt":"2005-09-11T17:29:10Z","messageCount":1,"participants":["Yasushi SHOJI"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"8296","messageId":"87wtln5x95.wl@mail2.atmark-techno.com","threadId":"1771","inReplyTo":null,"subject":"[PATCH] Escape asciidoc's built-in em-dash replacement","fromName":"Yasushi SHOJI","fromEmail":"yashi@atmark-techno.com","sentAt":"2005-09-11T17:29:10Z","receivedAt":"2005-09-11T17:29:10Z","isPatch":true,"sender":{"key":"yashi@atmark-techno.com","avatar":"https://gravatar.com/avatar/4817e8703ac4379935834d87453faa9d0c94b9dc19d83fcc54c67875eb133e59?d=mp&s=160"},"body":"Escape asciidoc's built-in em-dash replacement\n\nAsciiDoc replace '--' with em-dash (&#8212) by default. em-dash\nlooks a lot like a single long dash and it's very confusing when\nwe are talking about command options.\n\nSection 21.2.8 'Replacements' of AsciiDoc's User Guide says that a\nbackslash in front of double dash prevent the replacement.  This\npatch does just that.\n\nSigned-off-by: Yasushi SHOJI <yashi@atmark-techno.com>\n\n\n---\n\n Documentation/cvs-migration.txt |    2 +-\n Documentation/diffcore.txt      |   14 +++++++-------\n Documentation/hooks.txt         |    4 ++--\n Documentation/tutorial.txt      |    4 ++--\n 4 files changed, 12 insertions(+), 12 deletions(-)\n\na56c1105a491b974fe5a7102745ca477a8f8a7fd\ndiff --git a/Documentation/cvs-migration.txt b/Documentation/cvs-migration.txt\n--- a/Documentation/cvs-migration.txt\n+++ b/Documentation/cvs-migration.txt\n@@ -186,7 +186,7 @@ you would use git-rev-list and git-diff-\n \t\tnitfol();\n \t}'\n \n-We have already talked about the \"--stdin\" form of git-diff-tree\n+We have already talked about the \"\\--stdin\" form of git-diff-tree\n command that reads the list of commits and compares each commit\n with its parents.  The git-whatchanged command internally runs\n the equivalent of the above command, and can be used like this:\ndiff --git a/Documentation/diffcore.txt b/Documentation/diffcore.txt\n--- a/Documentation/diffcore.txt\n+++ b/Documentation/diffcore.txt\n@@ -22,8 +22,8 @@ The git-diff-* family works by first com\n files:\n \n  - git-diff-index compares contents of a \"tree\" object and the\n-   working directory (when '--cached' flag is not used) or a\n-   \"tree\" object and the index file (when '--cached' flag is\n+   working directory (when '\\--cached' flag is not used) or a\n+   \"tree\" object and the index file (when '\\--cached' flag is\n    used);\n \n  - git-diff-files compares contents of the index file and the\n@@ -164,11 +164,11 @@ similarity score different from the defa\n number after \"-M\" or \"-C\" option (e.g. \"-M8\" to tell it to use\n 8/10 = 80%).\n \n-Note.  When the \"-C\" option is used with --find-copies-harder\n+Note.  When the \"-C\" option is used with `\\--find-copies-harder`\n option, git-diff-\\* commands feed unmodified filepairs to\n diffcore mechanism as well as modified ones.  This lets the copy\n detector consider unmodified files as copy source candidates at\n-the expense of making it slower.  Without --find-copies-harder,\n+the expense of making it slower.  Without `\\--find-copies-harder`,\n git-diff-\\* commands can detect copies only if the file that was\n copied happened to have been modified in the same changeset.\n \n@@ -220,7 +220,7 @@ diffcore-pickaxe\n \n This transformation is used to find filepairs that represent\n changes that touch a specified string, and is controlled by the\n--S option and the --pickaxe-all option to the git-diff-*\n+-S option and the `\\--pickaxe-all` option to the git-diff-*\n commands.\n \n When diffcore-pickaxe is in use, it checks if there are\n@@ -229,9 +229,9 @@ whose \"result\" side does not.  Such a fi\n string appeared in this changeset\".  It also checks for the\n opposite case that loses the specified string.\n \n-When --pickaxe-all is not in effect, diffcore-pickaxe leaves\n+When `\\--pickaxe-all` is not in effect, diffcore-pickaxe leaves\n only such filepairs that touches the specified string in its\n-output.  When --pickaxe-all is used, diffcore-pickaxe leaves all\n+output.  When `\\--pickaxe-all` is used, diffcore-pickaxe leaves all\n filepairs intact if there is such a filepair, or makes the\n output empty otherwise.  The latter behaviour is designed to\n make reviewing of the changes in the context of the whole\ndiff --git a/Documentation/hooks.txt b/Documentation/hooks.txt\n--- a/Documentation/hooks.txt\n+++ b/Documentation/hooks.txt\n@@ -57,7 +57,7 @@ pre-commit\n ----------\n \n This hook is invoked by `git-commit`, and can be bypassed\n-with `--no-verify` option.  It takes no parameter, and is\n+with `\\--no-verify` option.  It takes no parameter, and is\n invoked before obtaining the proposed commit log message and\n making a commit.  Exiting with non-zero status from this script\n causes the `git-commit` to abort.\n@@ -70,7 +70,7 @@ commit-msg\n ----------\n \n This hook is invoked by `git-commit`, and can be bypassed\n-with `--no-verify` option.  It takes a single parameter, the\n+with `\\--no-verify` option.  It takes a single parameter, the\n name of the file that holds the proposed commit log message.\n Exiting with non-zero status causes the `git-commit` to\n abort.\ndiff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt\n--- a/Documentation/tutorial.txt\n+++ b/Documentation/tutorial.txt\n@@ -828,7 +828,7 @@ which will very loudly warn you that you\n (which is correct, so never mind), and you can write a small merge\n message about your adventures in git-merge-land.\n \n-After you're done, start up `gitk --all` to see graphically what the\n+After you're done, start up `gitk \\--all` to see graphically what the\n history looks like. Notice that `mybranch` still exists, and you can\n switch to it, and continue to work with it if you want to. The\n `mybranch` branch will not contain the merge, but next time you merge it\n@@ -883,7 +883,7 @@ not actually do a merge. Instead, it jus\n the tree of your branch to that of the `master` branch. This is\n often called 'fast forward' merge.\n \n-You can run `gitk --all` again to see how the commit ancestry\n+You can run `gitk \\--all` again to see how the commit ancestry\n looks like, or run `show-branch`, which tells you this.\n \n ------------------------------------------------\n"}]}