{"thread":{"id":"24801","subject":"[RFC/PATCH 00/17] unexpected backslashes in man pages","startedAt":"2010-08-20T10:19:02Z","lastAt":"2010-08-23T22:49:32Z","messageCount":22,"participants":["Jonathan Nieder","Thomas Rast","Ramkumar Ramachandra"],"isPatch":true,"patchVersion":1,"patchTotal":17},"messages":[{"id":"148522","messageId":"20100820101902.GA10356@burratino","threadId":"24801","inReplyTo":null,"subject":"[RFC/PATCH 00/17] unexpected backslashes in man pages","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-08-20T10:19:02Z","receivedAt":"2010-08-20T10:19:02Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"(cc: interested parties and documentation experts)\n\nHi,\n\nThis series is longer than I would like, and I am not happy to\nimpose the review burden. So if something does not look obviously\ncorrect at a glance, please let me know and I'll try to simplify it.\n\nThe topic: as Frédéric Brière noticed in\n, various man pages have collected\nbackslashes where they don't belong.\n\nMaybe we should forbid backslashes outside of\n\n--------\nliteral\n--------\n\nsections. Well, I did not go that far.\n\nStill, maybe the patches can be useful.\n\nJonathan Nieder (17):\n Documentation: tweak description of log.date\n Documentation: quoting trouble in \"git rm\" discussion\n Documentation: unbreak regex in show-ref --exclude-existing\n description\n Documentation: clarify quoting in \"git add\" example\n Documentation: add missing quotes to \"git grep\" examples\n Documentation: clarify quoting in \"git rm\" example\n Documentation: clarify quoting in gitignore docs\n Documentation: remove backslashes in manpage synopses\n Documentation/technical: avoid stray backslash in parse-options API\n docs\n Documentation: remove stray backslash from \"git bundle\" manual\n Documentation: remove backslash before ~ in fast-import manual\n Documentation: remove stray backslashes in rev-parse manual\n Documentation: remove stray backslash in show-branch discussion\n Documentation: avoid stray backslashes in core tutorial\n Documentation: avoid stray backslash in user manual\n Documentation: do not convert ... operator to ellipses\n Documentation: remove stray backslashes from \"Fighting regressions\"\n article\n\n Documentation/asciidoc.conf | 2 ++\n Documentation/config.txt | 9 +++++----\n Documentation/git-add.txt | 4 ++--\n Documentation/git-bisect-lk2009.txt | 2 +-\n Documentation/git-bundle.txt | 8 ++++----\n Documentation/git-checkout-index.txt | 2 +-\n Documentation/git-checkout.txt | 2 +-\n Documentation/git-commit-tree.txt | 2 +-\n Documentation/git-fast-export.txt | 2 +-\n Documentation/git-for-each-ref.txt | 2 +-\n Documentation/git-grep.txt | 4 ++--\n Documentation/git-ls-files.txt | 6 +++---\n Documentation/git-merge-index.txt | 2 +-\n Documentation/git-push.txt | 2 +-\n Documentation/git-rebase.txt | 2 +-\n Documentation/git-relink.txt | 2 +-\n Documentation/git-rev-parse.txt | 9 +++++----\n Documentation/git-rm.txt | 9 +++++----\n Documentation/git-show-branch.txt | 2 +-\n Documentation/git-show-ref.txt | 4 ++--\n Documentation/git-update-index.txt | 4 ++--\n Documentation/gitcore-tutorial.txt | 18 +++++++++---------\n Documentation/gitignore.txt | 4 ++--\n Documentation/rev-list-options.txt | 2 +-\n Documentation/technical/api-parse-options.txt | 8 ++++----\n Documentation/user-manual.txt | 4 ++--\n 26 files changed, 61 insertions(+), 56 deletions(-)\n\n-- \n1.7.2.2.536.g42dab.dirty\n"},{"id":"148523","messageId":"20100820102036.GA10407@burratino","threadId":"24801","inReplyTo":"20100820101902.GA10356@burratino","subject":"[PATCH 01/17] Documentation: tweak description of log.date","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-08-20T10:20:36Z","receivedAt":"2010-08-20T10:20:36Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"The markup \"'git log'\\'s\" produces a stray backslash in the\nproduced man page. Removing the backslash fixes it.\n\nWhile at it, tweak the surrounding description for readability.\n\nReported-by: Frédéric Brière \nSigned-off-by: Jonathan Nieder \n---\n Documentation/config.txt | 9 +++++----\n 1 files changed, 5 insertions(+), 4 deletions(-)\n\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex f81fb91..72cb2c9 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -1289,10 +1289,11 @@ interactive.singlekey::\n \tignored if portable keystroke input is not available.\n \n log.date::\n-\tSet default date-time mode for the log command. Setting log.date\n-\tvalue is similar to using 'git log'\\'s --date option. The value is one of the\n-\tfollowing alternatives: {relative,local,default,iso,rfc,short}.\n-\tSee linkgit:git-log[1].\n+\tSet the default date-time mode for the 'log' command.\n+\tSetting a value for log.date is similar to using 'git log''s\n+\t`\\--date` option. Possible values are `relative`, `local`,\n+\t`default`, `iso`, `rfc`, and `short`; see linkgit:git-log[1]\n+\tfor details.\n \n log.decorate::\n \tPrint out the ref names of any commits that are shown by the log\n-- \n1.7.2.2.536.g42dab.dirty\n"},{"id":"148524","messageId":"20100820102153.GB10407@burratino","threadId":"24801","inReplyTo":"20100820101902.GA10356@burratino","subject":"[PATCH 02/17] Documentation: quoting trouble in \"git rm\" discussion","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-08-20T10:21:53Z","receivedAt":"2010-08-20T10:21:53Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"The current output (with Asciidoc 8.5.2) seems a bit broken:\n\n\tgiven two directories ‘d` and d2, there is a difference\n\tbetween using git rm 'd*’ and ‘git rm 'd/\\*\\’`, as the\n\tformer will also remove all of directory d2.\n\nIn other words, the markup parses as\n\n\tgiven two directories << d` and _d2_, there is a difference\n\tbetween using _git rm 'd* >>_ and << git rm 'd/\\*\\ >> `.\n\nI suspect there is an asciidoc bug involved (why is ' a candidate\nclosing-quote mark when it is preceded by a backslash?) but with\nall the meanings of ` and ' involved I do not want to track it\ndown. Better to use unambiguous {asterisk} and {apostrophe}\nentities.\n\nSigned-off-by: Jonathan Nieder \n---\n Documentation/asciidoc.conf | 1 +\n Documentation/git-rm.txt | 3 ++-\n 2 files changed, 3 insertions(+), 1 deletions(-)\n\ndiff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf\nindex 87a90f2..6be8ba3 100644\n--- a/Documentation/asciidoc.conf\n+++ b/Documentation/asciidoc.conf\n@@ -17,6 +17,7 @@ caret=^\n startsb=[\n endsb=]\n tilde=~\n+apostrophe='\n backtick=`\n \n ifdef::backend-docbook[]\ndiff --git a/Documentation/git-rm.txt b/Documentation/git-rm.txt\nindex c21d19e..d146751 100644\n--- a/Documentation/git-rm.txt\n+++ b/Documentation/git-rm.txt\n@@ -78,7 +78,8 @@ a file that you have not told git about does not remove that file.\n \n File globbing matches across directory boundaries. Thus, given\n two directories `d` and `d2`, there is a difference between\n-using `git rm \\'d\\*\\'` and `git rm \\'d/\\*\\'`, as the former will\n+using `git rm {apostrophe}d{asterisk}{apostrophe}` and\n+`git rm {apostrophe}d/{asterisk}{apostrophe}`, as the former will\n also remove all of directory `d2`.\n \n REMOVING FILES THAT HAVE DISAPPEARED FROM THE FILESYSTEM\n-- \n1.7.2.2.536.g42dab.dirty\n"},{"id":"148528","messageId":"20100820102354.GC10407@burratino","threadId":"24801","inReplyTo":"20100820101902.GA10356@burratino","subject":"[PATCH 03/17] Documentation: unbreak regex in show-ref manual","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-08-20T10:23:54Z","receivedAt":"2010-08-20T10:23:54Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"I am not sure why, but the regular expression \"(?:\\^\\{\\})\" gets\nrendered by asciidoc as \"(?:\\{})\". The intent seems to be a regex\nmatching the literal string \"^{}\", so this rewrites the markup to\nproduce \"(?:\\^{})\" as output.\n\nCc: Julian Phillips \nSigned-off-by: Jonathan Nieder \n---\n Documentation/asciidoc.conf | 1 +\n Documentation/git-show-ref.txt | 4 ++--\n 2 files changed, 3 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf\nindex 6be8ba3..b5f0f29 100644\n--- a/Documentation/asciidoc.conf\n+++ b/Documentation/asciidoc.conf\n@@ -16,6 +16,7 @@ plus=+\n caret=^\n startsb=[\n endsb=]\n+backslash=\\n tilde=~\n apostrophe='\n backtick=`\ndiff --git a/Documentation/git-show-ref.txt b/Documentation/git-show-ref.txt\nindex 75780d7..4696af7 100644\n--- a/Documentation/git-show-ref.txt\n+++ b/Documentation/git-show-ref.txt\n@@ -73,8 +73,8 @@ OPTIONS\n --exclude-existing[=]::\n \n \tMake 'git show-ref' act as a filter that reads refs from stdin of the\n-\tform \"^(?:\\s)?(?:\\^\\{\\})?$\" and performs the\n-\tfollowing actions on each:\n+\tform \"^(?:\\s)?(?:{backslash}{caret}\\{\\})?$\"\n+\tand performs the following actions on each:\n \t(1) strip \"^{}\" at the end of line if any;\n \t(2) ignore if pattern is provided and does not head-match refname;\n \t(3) warn if refname is not a well-formed refname and skip;\n-- \n1.7.2.2.536.g42dab.dirty\n"},{"id":"148525","messageId":"20100820102613.GD10407@burratino","threadId":"24801","inReplyTo":"20100820101902.GA10356@burratino","subject":"[PATCH 04/17] Documentation: clarify quoting in \"git add\" example","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-08-20T10:26:13Z","receivedAt":"2010-08-20T10:26:13Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"The intended text looks like this:\n\n\t· Adds content from all *.txt files under Documentation\n\t directory and its subdirectories:\n\n\t\t$ git add Documentation/\\*.txt\n\n\t Note that the asterisk * is quoted from the shell in this\n\t example; this lets the command include the files from\n\t subdirectories of Documentation/ directory.\n\nThe current asciidoc 8.5.2 output has a backslash before _every_\nasterisk, which is more confusing than it needs to be.\n\nReported-by: Frédéric Brière \nCc: Junio C Hamano \nSigned-off-by: Jonathan Nieder \n---\n Documentation/git-add.txt | 4 ++--\n 1 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-add.txt b/Documentation/git-add.txt\nindex e22a62f..e213a2e 100644\n--- a/Documentation/git-add.txt\n+++ b/Documentation/git-add.txt\n@@ -157,14 +157,14 @@ those in info/exclude. See linkgit:gitrepository-layout[5].\n EXAMPLES\n --------\n \n-* Adds content from all `\\*.txt` files under `Documentation` directory\n+* Adds content from all `*.txt` files under `Documentation` directory\n and its subdirectories:\n +\n ------------\n $ git add Documentation/\\*.txt\n ------------\n +\n-Note that the asterisk `\\*` is quoted from the shell in this\n+Note that the asterisk `*` is quoted from the shell in this\n example; this lets the command include the files from\n subdirectories of `Documentation/` directory.\n \n-- \n1.7.2.2.536.g42dab.dirty\n"},{"id":"148526","messageId":"20100820102853.GE10407@burratino","threadId":"24801","inReplyTo":"20100820101902.GA10356@burratino","subject":"[PATCH 05/17] Documentation: add missing quotes to \"git grep\" examples","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-08-20T10:28:53Z","receivedAt":"2010-08-20T10:28:53Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Without an indication to the contrary, Asciidoc puts 'quoted\ntext' in italics, making the output look like this:\n\n\tgit grep time_t -- *.[ch]\n\t Looks for time_t in all tracked .c and .h\n\t files in the working directory and its subdirectories.\n\n\tgit grep -e '#define\\' --and \\( -e MAX_PATH -e PATH_MAX \\)\n\t Looks for a line that has #define and either MAX_PATH or\n\t PATH_MAX.\n\nIn the first example, the *.[ch] argument needs to be protected from\nthe shell, or else it will only match files in the current directory.\nThe second example has a stray backslash.\n\nReported-by: Frédéric Brière \nCc: Mark Lodato \nCc: Junio C Hamano \nSigned-off-by: Jonathan Nieder \n---\n Documentation/git-grep.txt | 4 ++--\n 1 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt\nindex 5474dd7..dab0a78 100644\n--- a/Documentation/git-grep.txt\n+++ b/Documentation/git-grep.txt\n@@ -191,11 +191,11 @@ OPTIONS\n Examples\n --------\n \n-git grep 'time_t' \\-- '*.[ch]'::\n+git grep {apostrophe}time_t{apostrophe} \\-- {apostrophe}*.[ch]{apostrophe}::\n \tLooks for `time_t` in all tracked .c and .h files in the working\n \tdirectory and its subdirectories.\n \n-git grep -e \\'#define\\' --and \\( -e MAX_PATH -e PATH_MAX \\)::\n+git grep -e {apostrophe}#define{apostrophe} --and \\( -e MAX_PATH -e PATH_MAX \\)::\n \tLooks for a line that has `#define` and either `MAX_PATH` or\n \t`PATH_MAX`.\n \n-- \n1.7.2.2.536.g42dab.dirty\n"},{"id":"148527","messageId":"20100820103024.GF10407@burratino","threadId":"24801","inReplyTo":"20100820101902.GA10356@burratino","subject":"[PATCH 06/17] Documentation: clarify quoting in \"git rm\" example","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-08-20T10:30:24Z","receivedAt":"2010-08-20T10:30:24Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Intended output:\n\n\tgit rm Documentation/\\*.txt\n\t\tRemoves all *.txt files from the index that are under\n\t\tthe Documentation directory and any of its\n\t\tsubdirectories.\n\n\t\tNote that the asterisk * is quoted from the shell in\n\t\tthis example; this lets git, and not the shell, expand\n\t\tthe pathnames of files and subdirectories under the\n\t\tDocumentation/ directory.\n\nWithout this change, there are too many backslashes output.\nTested with asciidoc 8.5.2.\n\nReported-by: Frédéric Brière \nCc: Carl Worth \nSigned-off-by: Jonathan Nieder \n---\n Documentation/git-rm.txt | 6 +++---\n 1 files changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/Documentation/git-rm.txt b/Documentation/git-rm.txt\nindex d146751..71e3d9f 100644\n--- a/Documentation/git-rm.txt\n+++ b/Documentation/git-rm.txt\n@@ -136,11 +136,11 @@ git diff --name-only --diff-filter=D -z | xargs -0 git rm --cached\n \n EXAMPLES\n --------\n-git rm Documentation/\\\\*.txt::\n-\tRemoves all `\\*.txt` files from the index that are under the\n+git rm Documentation/\\*.txt::\n+\tRemoves all `*.txt` files from the index that are under the\n \t`Documentation` directory and any of its subdirectories.\n +\n-Note that the asterisk `\\*` is quoted from the shell in this\n+Note that the asterisk `*` is quoted from the shell in this\n example; this lets git, and not the shell, expand the pathnames\n of files and subdirectories under the `Documentation/` directory.\n \n-- \n1.7.2.2.536.g42dab.dirty\n"},{"id":"148529","messageId":"20100820103056.GG10407@burratino","threadId":"24801","inReplyTo":"20100820101902.GA10356@burratino","subject":"[PATCH 07/17] Documentation: clarify quoting in gitignore docs","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-08-20T10:30:56Z","receivedAt":"2010-08-20T10:30:56Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"An asterisk in \"Documentation/*.txt\" quoted with \\ to avoid bold text\nis being output as \\* because asciidoc does not consider it a\ncandidate for escaping (there is no matching * to pair it with).\n\nSo the manual looks like it is saying that one should write\n\"Documentation/\\*.txt\" in the .gitignore file.\n\nReported-by: Frédéric Brière \nSigned-off-by: Jonathan Nieder \n---\n Documentation/gitignore.txt | 4 ++--\n 1 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt\nindex e10fa88..7dc2e8b 100644\n--- a/Documentation/gitignore.txt\n+++ b/Documentation/gitignore.txt\n@@ -90,12 +90,12 @@ Patterns have the following format:\n - Otherwise, git treats the pattern as a shell glob suitable\n for consumption by fnmatch(3) with the FNM_PATHNAME flag:\n wildcards in the pattern will not match a / in the pathname.\n- For example, \"Documentation/\\*.html\" matches\n+ For example, \"Documentation/{asterisk}.html\" matches\n \"Documentation/git.html\" but not \"Documentation/ppc/ppc.html\"\n or \"tools/perf/Documentation/perf.html\".\n \n - A leading slash matches the beginning of the pathname.\n- For example, \"/*.c\" matches \"cat-file.c\" but not\n+ For example, \"/{asterisk}.c\" matches \"cat-file.c\" but not\n \"mozilla-sha1/sha1.c\".\n \n An example:\n-- \n1.7.2.2.536.g42dab.dirty\n"},{"id":"148530","messageId":"20100820103158.GH10407@burratino","threadId":"24801","inReplyTo":"20100820101902.GA10356@burratino","subject":"[PATCH 08/17] Documentation: remove backslashes in manpage synopses","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-08-20T10:31:58Z","receivedAt":"2010-08-20T10:31:58Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"For some reason, various manual pages have an asterisk escaped\nwith \\ in the synopsis. Since there is no other asterisk to pair it\nwith, Asciidoc does not consider this asterisk escapable, so it passes\nthe backslash through.\n\nEach page either uses [verse] or has only one asterisk, so it\nis safe to drop the backslashes (checked with asciidoc 8.5.2).\n\nSigned-off-by: Jonathan Nieder \n---\n Documentation/git-checkout-index.txt | 2 +-\n Documentation/git-commit-tree.txt | 2 +-\n Documentation/git-for-each-ref.txt | 2 +-\n Documentation/git-ls-files.txt | 6 +++---\n Documentation/git-merge-index.txt | 2 +-\n Documentation/git-relink.txt | 2 +-\n Documentation/git-update-index.txt | 4 ++--\n 7 files changed, 10 insertions(+), 10 deletions(-)\n\ndiff --git a/Documentation/git-checkout-index.txt b/Documentation/git-checkout-index.txt\nindex d6aa6e1..62f9ab2 100644\n--- a/Documentation/git-checkout-index.txt\n+++ b/Documentation/git-checkout-index.txt\n@@ -13,7 +13,7 @@ SYNOPSIS\n \t\t [--stage=|all]\n \t\t [--temp]\n \t\t [-z] [--stdin]\n-\t\t [--] []\\*\n+\t\t [--] []*\n \n DESCRIPTION\n -----------\ndiff --git a/Documentation/git-commit-tree.txt b/Documentation/git-commit-tree.txt\nindex 6188854..349366e 100644\n--- a/Documentation/git-commit-tree.txt\n+++ b/Documentation/git-commit-tree.txt\n@@ -8,7 +8,7 @@ git-commit-tree - Create a new commit object\n \n SYNOPSIS\n --------\n-'git commit-tree' [-p ]\\* < changelog\n+'git commit-tree' [-p ]* < changelog\n \n DESCRIPTION\n -----------\ndiff --git a/Documentation/git-for-each-ref.txt b/Documentation/git-for-each-ref.txt\nindex 390d85c..d66fd9d 100644\n--- a/Documentation/git-for-each-ref.txt\n+++ b/Documentation/git-for-each-ref.txt\n@@ -9,7 +9,7 @@ SYNOPSIS\n --------\n [verse]\n 'git for-each-ref' [--count=] [--shell|--perl|--python|--tcl]\n-\t\t [--sort=]\\* [--format=] [...]\n+\t\t [--sort=]* [--format=] [...]\n \n DESCRIPTION\n -----------\ndiff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt\nindex bd919f2..45a7f56 100644\n--- a/Documentation/git-ls-files.txt\n+++ b/Documentation/git-ls-files.txt\n@@ -10,14 +10,14 @@ SYNOPSIS\n --------\n [verse]\n 'git ls-files' [-z] [-t] [-v]\n-\t\t(--[cached|deleted|others|ignored|stage|unmerged|killed|modified])\\*\n-\t\t(-[c|d|o|i|s|u|k|m])\\*\n+\t\t(--[cached|deleted|others|ignored|stage|unmerged|killed|modified])*\n+\t\t(-[c|d|o|i|s|u|k|m])*\n \t\t[-x |--exclude=]\n \t\t[-X |--exclude-from=]\n \t\t[--exclude-per-directory=]\n \t\t[--exclude-standard]\n \t\t[--error-unmatch] [--with-tree=]\n-\t\t[--full-name] [--abbrev] [--] []\\*\n+\t\t[--full-name] [--abbrev] [--] []*\n \n DESCRIPTION\n -----------\ndiff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt\nindex 4d266de..921b38f 100644\n--- a/Documentation/git-merge-index.txt\n+++ b/Documentation/git-merge-index.txt\n@@ -8,7 +8,7 @@ git-merge-index - Run a merge for files needing merging\n \n SYNOPSIS\n --------\n-'git merge-index' [-o] [-q] (-a | [--] \\*)\n+'git merge-index' [-o] [-q] (-a | [--] *)\n \n DESCRIPTION\n -----------\ndiff --git a/Documentation/git-relink.txt b/Documentation/git-relink.txt\nindex 25ff8f9..8a5842b 100644\n--- a/Documentation/git-relink.txt\n+++ b/Documentation/git-relink.txt\n@@ -7,7 +7,7 @@ git-relink - Hardlink common objects in local repositories\n \n SYNOPSIS\n --------\n-'git relink' [--safe] []\\* \n+'git relink' [--safe] []* \n \n DESCRIPTION\n -----------\ndiff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt\nindex 765d4b3..74d1d49 100644\n--- a/Documentation/git-update-index.txt\n+++ b/Documentation/git-update-index.txt\n@@ -12,7 +12,7 @@ SYNOPSIS\n 'git update-index'\n \t [--add] [--remove | --force-remove] [--replace]\n \t [--refresh] [-q] [--unmerged] [--ignore-missing]\n-\t [--cacheinfo ]\\*\n+\t [--cacheinfo ]*\n \t [--chmod=(+|-)x]\n \t [--assume-unchanged | --no-assume-unchanged]\n \t [--skip-worktree | --no-skip-worktree]\n@@ -21,7 +21,7 @@ SYNOPSIS\n \t [--info-only] [--index-info]\n \t [-z] [--stdin]\n \t [--verbose]\n-\t [--] []\\*\n+\t [--] []*\n \n DESCRIPTION\n -----------\n-- \n1.7.2.2.536.g42dab.dirty\n"},{"id":"148531","messageId":"20100820103236.GI10407@burratino","threadId":"24801","inReplyTo":"20100820101902.GA10356@burratino","subject":"[PATCH 09/17] Documentation/technical: avoid stray backslash in parse-options API docs","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-08-20T10:32:36Z","receivedAt":"2010-08-20T10:32:36Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Due to some unpleasant interaction between the `quote', 'italics',\nand `monospace` rules, a certain paragraph ends up rendered like so:\n\n\t‘short` is a character for the short option\n\t (e.g. 'e\\’ for -e, use 0 to omit),\n\nUse the {apostrophe} to avoid this.\n\nWhile at it, escape \"->\" strings: they are meant as a literal\ntwo-character C operator, not a right-pointing arrow.\n\nReported-by: Frédéric Brière \nSigned-off-by: Jonathan Nieder \n---\n Documentation/technical/api-parse-options.txt | 8 ++++----\n 1 files changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/Documentation/technical/api-parse-options.txt b/Documentation/technical/api-parse-options.txt\nindex 312e3b2..c5d141c 100644\n--- a/Documentation/technical/api-parse-options.txt\n+++ b/Documentation/technical/api-parse-options.txt\n@@ -201,7 +201,7 @@ The last element of the array must be `OPT_END()`.\n If not stated otherwise, interpret the arguments as follows:\n \n * `short` is a character for the short option\n- (e.g. `\\'e\\'` for `-e`, use `0` to omit),\n+ (e.g. `{apostrophe}e{apostrophe}` for `-e`, use `0` to omit),\n \n * `long` is a string for the long option\n (e.g. `\"example\"` for `\\--example`, use `NULL` to omit),\n@@ -228,10 +228,10 @@ The function must be defined in this form:\n The callback mechanism is as follows:\n \n * Inside `func`, the only interesting member of the structure\n- given by `opt` is the void pointer `opt->value`.\n- `\\*opt->value` will be the value that is saved into `var`, if you\n+ given by `opt` is the void pointer `opt\\->value`.\n+ `\\*opt\\->value` will be the value that is saved into `var`, if you\n use `OPT_CALLBACK()`.\n- For example, do `*(unsigned long *)opt->value = 42;` to get 42\n+ For example, do `*(unsigned long *)opt\\->value = 42;` to get 42\n into an `unsigned long` variable.\n \n * Return value `0` indicates success and non-zero return\n-- \n1.7.2.2.536.g42dab.dirty\n"},{"id":"148532","messageId":"20100820103348.GJ10407@burratino","threadId":"24801","inReplyTo":"20100820101902.GA10356@burratino","subject":"[PATCH 10/17] Documentation: remove stray backslash from \"git bundle\" manual","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-08-20T10:33:48Z","receivedAt":"2010-08-20T10:33:48Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"In v1.6.2.2~6^2~4 (Documentation: minor grammatical fixes\nand rewording in git-bundle.txt, 2009-03-22), backslashes were\nintroduced before ~ to avoid introducing unintentional\nsuperscripts. In one paragraph there is only one ~, though,\nmaking that not a candidate for quoting, and asciidoc 8.5.8\npasses the backslash through so the man page says \"\\~10..master\".\n\nMaybe there is an asciidoc behavior change involved.\n\nIn any case, we should replace tildes with a {tilde} entity which\nmeans the same thing regardless of where it is found.\n\nReported-by: Frédéric Brière \nCc: David J. Mellor \nSigned-off-by: Jonathan Nieder \n---\n Documentation/git-bundle.txt | 8 ++++----\n 1 files changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/Documentation/git-bundle.txt b/Documentation/git-bundle.txt\nindex a5ed8fb..f0b75c7 100644\n--- a/Documentation/git-bundle.txt\n+++ b/Documentation/git-bundle.txt\n@@ -60,7 +60,7 @@ unbundle ::\n [git-rev-list-args...]::\n A list of arguments, acceptable to 'git rev-parse' and\n 'git rev-list', that specifies the specific objects and references\n- to transport. For example, `master\\~10..master` causes the\n+ to transport. For example, `master~10..master` causes the\n current master reference to be packaged along with all objects\n added since its 10th ancestor commit. There is no explicit\n limit to the number of references and objects that may be\n@@ -79,12 +79,12 @@ SPECIFYING REFERENCES\n \n 'git bundle' will only package references that are shown by\n 'git show-ref': this includes heads, tags, and remote heads. References\n-such as `master\\~1` cannot be packaged, but are perfectly suitable for\n+such as `master{tilde}1` cannot be packaged, but are perfectly suitable for\n defining the basis. More than one reference may be packaged, and more\n than one basis can be specified. The objects packaged are those not\n contained in the union of the given bases. Each basis can be\n-specified explicitly (e.g. `^master\\~10`), or implicitly (e.g.\n-`master\\~10..master`, `--since=10.days.ago master`).\n+specified explicitly (e.g. `^master{tilde}10`), or implicitly (e.g.\n+`master{tilde}10..master`, `--since=10.days.ago master`).\n \n It is very important that the basis used be held by the destination.\n It is okay to err on the side of caution, causing the bundle file\n-- \n1.7.2.2.536.g42dab.dirty\n"},{"id":"148533","messageId":"20100820103429.GK10407@burratino","threadId":"24801","inReplyTo":"20100820101902.GA10356@burratino","subject":"[PATCH 11/17] Documentation: remove backslash before ~ in fast-import manual","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-08-20T10:34:29Z","receivedAt":"2010-08-20T10:34:29Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Use the {tilde} entity to get a literal tilde without fuss.\nWith \\~, asciidoc 8.5.2 (and probably earlier versions) keeps the\nbackslash in the output.\n\nReported-by: Frédéric Brière \nSigned-off-by: Jonathan Nieder \n---\n Documentation/git-fast-export.txt | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/Documentation/git-fast-export.txt b/Documentation/git-fast-export.txt\nindex 98ec6b5..cbc31c1 100644\n--- a/Documentation/git-fast-export.txt\n+++ b/Documentation/git-fast-export.txt\n@@ -93,7 +93,7 @@ marks the same across runs.\n [git-rev-list-args...]::\n A list of arguments, acceptable to 'git rev-parse' and\n 'git rev-list', that specifies the specific objects and references\n- to export. For example, `master\\~10..master` causes the\n+ to export. For example, `master{tilde}10..master` causes the\n current master reference to be exported along with all objects\n added since its 10th ancestor commit.\n \n-- \n1.7.2.2.536.g42dab.dirty\n"},{"id":"148534","messageId":"20100820103503.GL10407@burratino","threadId":"24801","inReplyTo":"20100820101902.GA10356@burratino","subject":"[PATCH 12/17] Documentation: remove stray backslashes in rev-parse manual","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-08-20T10:35:03Z","receivedAt":"2010-08-20T10:35:03Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Use the {asterisk} entity instead of \\* or * to avoid both\nstray backslashes in output and suppression of asterisks\nmisinterpreted as a bold-text delimiter.\n\nReported-by: Frédéric Brière \nSigned-off-by: Jonathan Nieder \n---\n Documentation/git-rev-parse.txt | 9 +++++----\n 1 files changed, 5 insertions(+), 4 deletions(-)\n\ndiff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt\nindex be4c053..341ca90 100644\n--- a/Documentation/git-rev-parse.txt\n+++ b/Documentation/git-rev-parse.txt\n@@ -74,7 +74,7 @@ OPTIONS\n \tproperly quoted for consumption by shell. Useful when\n \tyou expect your parameter to contain whitespaces and\n \tnewlines (e.g. when using pickaxe `-S` with\n-\t'git diff-\\*'). In contrast to the `--sq-quote` option,\n+\t'git diff-{asterisk}'). In contrast to the `--sq-quote` option,\n \tthe command input is still interpreted as usual.\n \n --not::\n@@ -112,14 +112,15 @@ OPTIONS\n +\n If a `pattern` is given, only refs matching the given shell glob are\n shown. If the pattern does not contain a globbing character (`?`,\n-`\\*`, or `[`), it is turned into a prefix match by appending `/\\*`.\n+`{asterisk}`, or `[`), it is turned into a prefix match by\n+appending `/{asterisk}`.\n \n --glob=pattern::\n \tShow all refs matching the shell glob pattern `pattern`. If\n \tthe pattern does not start with `refs/`, this is automatically\n \tprepended. If the pattern does not contain a globbing\n-\tcharacter (`?`, `\\*`, or `[`), it is turned into a prefix\n-\tmatch by appending `/\\*`.\n+\tcharacter (`?`, `{asterisk}`, or `[`), it is turned into a prefix\n+\tmatch by appending `/{asterisk}`.\n \n --show-toplevel::\n \tShow the absolute path of the top-level directory.\n-- \n1.7.2.2.536.g42dab.dirty\n"},{"id":"148535","messageId":"20100820103706.GM10407@burratino","threadId":"24801","inReplyTo":"20100820101902.GA10356@burratino","subject":"[PATCH 13/17] Documentation: remove stray backslash in show-branch discussion","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-08-20T10:37:06Z","receivedAt":"2010-08-20T10:37:06Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Because there is no unescaped apostrophe to pair it with, asciidoc\ndoes not consider this apostrophe a candidate for escaping and\nthe backslash passes through.\n\nReported-by: Frédéric Brière \nSigned-off-by: Jonathan Nieder \n---\n Documentation/git-show-branch.txt | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.txt\nindex 81ba296..01fc157 100644\n--- a/Documentation/git-show-branch.txt\n+++ b/Documentation/git-show-branch.txt\n@@ -168,7 +168,7 @@ $ git show-branch master fixes mhf\n ------------------------------------------------\n \n These three branches all forked from a common commit, [master],\n-whose commit message is \"Add \\'git show-branch\\'\". The \"fixes\"\n-branch adds one commit \"Introduce \"reset type\" flag to \"git reset\"\".\n-The \"mhf\" branch adds many other commits. The current branch\n-is \"master\".\n+whose commit message is \"Add {apostrophe}git show-branch{apostrophe}\".\n+The \"fixes\" branch adds one commit \"Introduce \"reset type\" flag to\n+\"git reset\"\". The \"mhf\" branch adds many other commits.\n+The current branch is \"master\".\n-- \n1.7.2.2.536.g42dab.dirty\n"},{"id":"148536","messageId":"20100820103751.GN10407@burratino","threadId":"24801","inReplyTo":"20100820101902.GA10356@burratino","subject":"[PATCH 14/17] Documentation: avoid stray backslashes in core tutorial","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-08-20T10:37:51Z","receivedAt":"2010-08-20T10:37:51Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"While at it:\n\n - remove some single-quotes that were being rendered as ’\\n\\';\n\n - do not escape ellipses (...) when they do not represent the\n literal three characters \"...\". We may want to ensure the\n manpages render these as three ASCII periods to make the\n manual pages easier to search, but that would be a global\n output generation setting, not a context-specific thing;\n\nReported-by: Frédéric Brière \nSigned-off-by: Jonathan Nieder \n---\n Documentation/gitcore-tutorial.txt | 18 +++++++++---------\n 1 files changed, 9 insertions(+), 9 deletions(-)\n\ndiff --git a/Documentation/gitcore-tutorial.txt b/Documentation/gitcore-tutorial.txt\nindex ed3ddc9..5e9c5eb 100644\n--- a/Documentation/gitcore-tutorial.txt\n+++ b/Documentation/gitcore-tutorial.txt\n@@ -110,7 +110,7 @@ An 'object' is identified by its 160-bit SHA1 hash, aka 'object name',\n and a reference to an object is always the 40-byte hex\n representation of that SHA1 name. The files in the `refs`\n subdirectory are expected to contain these hex references\n-(usually with a final `\\'\\n\\'` at the end), and you should thus\n+(usually with a final `\\n` at the end), and you should thus\n expect to see a number of 41-byte files containing these\n references in these `refs` subdirectories when you actually start\n populating your tree.\n@@ -310,7 +310,7 @@ and this will just output the name of the resulting tree, in this case\n ----------------\n \n which is another incomprehensible object name. Again, if you want to,\n-you can use `git cat-file -t 8988d\\...` to see that this time the object\n+you can use `git cat-file -t 8988d...` to see that this time the object\n is not a \"blob\" object, but a \"tree\" object (you can also use\n `git cat-file` to actually output the raw object contents, but you'll see\n mainly a binary mess, so that's less interesting).\n@@ -436,8 +436,8 @@ $ git update-index hello\n (note how we didn't need the `\\--add` flag this time, since git knew\n about the file already).\n \n-Note what happens to the different 'git diff-\\*' versions here. After\n-we've updated `hello` in the index, `git diff-files -p` now shows no\n+Note what happens to the different 'git diff-{asterisk}' versions here.\n+After we've updated `hello` in the index, `git diff-files -p` now shows no\n differences, but `git diff-index -p HEAD` still *does* show that the\n current state is different from the state we committed. In fact, now\n 'git diff-index' shows the same difference whether we use the `--cached`\n@@ -494,7 +494,7 @@ and it will show what the last commit (in `HEAD`) actually changed.\n [NOTE]\n ============\n Here is an ASCII art by Jon Loeliger that illustrates how\n-various diff-\\* commands compare things.\n+various 'diff-{asterisk}' commands compare things.\n \n diff-tree\n +----+\n@@ -958,11 +958,11 @@ $ git show-branch --topo-order --more=1 master mybranch\n The first two lines indicate that it is showing the two branches\n and the first line of the commit log message from their\n top-of-the-tree commits, you are currently on `master` branch\n-(notice the asterisk `\\*` character), and the first column for\n+(notice the asterisk `{asterisk}` character), and the first column for\n the later output lines is used to show commits contained in the\n `master` branch, and the second column for the `mybranch`\n branch. Three commits are shown along with their log messages.\n-All of them have non blank characters in the first column (`*`\n+All of them have non blank characters in the first column (`{asterisk}`\n shows an ordinary commit on the current branch, `-` is a merge commit), which\n means they are now part of the `master` branch. Only the \"Some\n work\" commit has the plus `+` character in the second column,\n@@ -1092,7 +1092,7 @@ Downloader from http and https URL\n first obtains the topmost commit object name from the remote site\n by looking at the specified refname under `repo.git/refs/` directory,\n and then tries to obtain the\n-commit object by downloading from `repo.git/objects/xx/xxx\\...`\n+commit object by downloading from `repo.git/objects/xx/xxx...`\n using the object name of that commit object. Then it reads the\n commit object to find out its parent commits and the associate\n tree object; it repeats this process until it gets all the\n@@ -1420,7 +1420,7 @@ packed, and stores the packed file in `.git/objects/pack`\n directory.\n \n [NOTE]\n-You will see two files, `pack-\\*.pack` and `pack-\\*.idx`,\n+You will see two files, `pack-{asterisk}.pack` and `pack-{asterisk}.idx`,\n in `.git/objects/pack` directory. They are closely related to\n each other, and if you ever copy them by hand to a different\n repository for whatever reason, you should make sure you copy\n-- \n1.7.2.2.536.g42dab.dirty\n"},{"id":"148537","messageId":"20100820103814.GO10407@burratino","threadId":"24801","inReplyTo":"20100820101902.GA10356@burratino","subject":"[PATCH 15/17] Documentation: avoid stray backslash in user manual","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-08-20T10:38:14Z","receivedAt":"2010-08-20T10:38:14Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Signed-off-by: Jonathan Nieder \n---\n Documentation/user-manual.txt | 4 ++--\n 1 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt\nindex 22aee34..fecc4eb 100644\n--- a/Documentation/user-manual.txt\n+++ b/Documentation/user-manual.txt\n@@ -4251,9 +4251,9 @@ Two things are interesting here:\n negative numbers in case of different errors--and 0 on success.\n \n - the variable `sha1` in the function signature of `get_sha1()` is `unsigned\n- char \\*`, but is actually expected to be a pointer to `unsigned\n+ char {asterisk}`, but is actually expected to be a pointer to `unsigned\n char[20]`. This variable will contain the 160-bit SHA-1 of the given\n- commit. Note that whenever a SHA-1 is passed as `unsigned char \\*`, it\n+ commit. Note that whenever a SHA-1 is passed as `unsigned char {asterisk}`, it\n is the binary representation, as opposed to the ASCII representation in\n hex characters, which is passed as `char *`.\n \n-- \n1.7.2.2.536.g42dab.dirty\n"},{"id":"148538","messageId":"20100820103948.GP10407@burratino","threadId":"24801","inReplyTo":"20100820101902.GA10356@burratino","subject":"[PATCH 16/17] Documentation: do not convert ... operator to ellipses","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-08-20T10:39:48Z","receivedAt":"2010-08-20T10:39:48Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"The symmetric difference or merge-base operator ... as used by\nrev-list and diff is actually three period characters. If it\ngets replaced by an ellipsis glyph in the manual, that would\nstop readers from copying and pasting it.\n\nSigned-off-by: Jonathan Nieder \n---\n Documentation/git-checkout.txt | 2 +-\n Documentation/git-push.txt | 2 +-\n Documentation/git-rebase.txt | 2 +-\n Documentation/rev-list-options.txt | 2 +-\n 4 files changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt\nindex 1bacd2e..e015373 100644\n--- a/Documentation/git-checkout.txt\n+++ b/Documentation/git-checkout.txt\n@@ -170,7 +170,7 @@ As a special case, the `\"@\\{-N\\}\"` syntax for the N-th last branch\n checks out the branch (instead of detaching). You may also specify\n `-` which is synonymous with `\"@\\{-1\\}\"`.\n +\n-As a further special case, you may use `\"A...B\"` as a shortcut for the\n+As a further special case, you may use `\"A\\...B\"` as a shortcut for the\n merge base of `A` and `B` if there is exactly one merge base. You can\n leave out at most one of `A` and `B`, in which case it defaults to `HEAD`.\n \ndiff --git a/Documentation/git-push.txt b/Documentation/git-push.txt\nindex 658ff2f..020955f 100644\n--- a/Documentation/git-push.txt\n+++ b/Documentation/git-push.txt\n@@ -200,7 +200,7 @@ summary::\n \tFor a successfully pushed ref, the summary shows the old and new\n \tvalues of the ref in a form suitable for using as an argument to\n \t`git log` (this is `..` in most cases, and\n-\t`...` for forced non-fast-forward updates).\n+\t`\\...` for forced non-fast-forward updates).\n +\n For a failed update, more details are given:\n +\ndiff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt\nindex be23ad2..2ed62ca 100644\n--- a/Documentation/git-rebase.txt\n+++ b/Documentation/git-rebase.txt\n@@ -207,7 +207,7 @@ OPTIONS\n \t. May be any valid commit, and not just an\n \texisting branch name.\n +\n-As a special case, you may use \"A...B\" as a shortcut for the\n+As a special case, you may use \"A\\...B\" as a shortcut for the\n merge base of A and B if there is exactly one merge base. You can\n leave out at most one of A and B, in which case it defaults to HEAD.\n \ndiff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt\nindex cc562a0..e2237ae 100644\n--- a/Documentation/rev-list-options.txt\n+++ b/Documentation/rev-list-options.txt\n@@ -321,7 +321,7 @@ excluded from the output.\n \treflog entries from the most recent one to older ones.\n \tWhen this option is used you cannot specify commits to\n \texclude (that is, '{caret}commit', 'commit1..commit2',\n-\tnor 'commit1...commit2' notations cannot be used).\n+\tnor 'commit1\\...commit2' notations cannot be used).\n +\n With '\\--pretty' format other than oneline (for obvious reasons),\n this causes the output to have two extra lines of information\n-- \n1.7.2.2.536.g42dab.dirty\n"},{"id":"148539","messageId":"20100820104031.GQ10407@burratino","threadId":"24801","inReplyTo":"20100820101902.GA10356@burratino","subject":"[PATCH 17/17] Documentation: remove stray backslashes from \"Fighting regressions\" article","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-08-20T10:40:31Z","receivedAt":"2010-08-20T10:40:31Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"The intended text is \"it's O(N * T) vs O(N * T * M)\". Asciidoc\nnotices the spaces around the asterisks so there is no need to\nescape them (and if you try, it passes the backslashes through).\n\nCc: Christian Couder \nSigned-off-by: Jonathan Nieder \n---\nThat's the end of the series. Thanks for reading.\n\n Documentation/git-bisect-lk2009.txt | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/Documentation/git-bisect-lk2009.txt b/Documentation/git-bisect-lk2009.txt\nindex 86b3015..ed5ea29 100644\n--- a/Documentation/git-bisect-lk2009.txt\n+++ b/Documentation/git-bisect-lk2009.txt\n@@ -873,7 +873,7 @@ c * N * T + b * M * log2(M) tests\n where c is the number of rounds of test (so a small constant) and b is\n the ratio of bug per commit (hopefully a small constant too).\n \n-So of course it's much better as it's O(N \\* T) vs O(N \\* T \\* M) if\n+So of course it's much better as it's O(N * T) vs O(N * T * M) if\n you would test everything after each commit.\n \n This means that test suites are good to prevent some bugs from being\n-- \n1.7.2.2.536.g42dab.dirty\n"},{"id":"148741","messageId":"201008231318.30768.trast@student.ethz.ch","threadId":"24801","inReplyTo":"20100820103706.GM10407@burratino","subject":"Re: [PATCH 13/17] Documentation: remove stray backslash in show-branch discussion","fromName":"Thomas Rast","fromEmail":"trast@student.ethz.ch","sentAt":"2010-08-23T11:18:30Z","receivedAt":"2010-08-23T11:18:30Z","isPatch":true,"sender":{"key":"tr@thomasrast.ch","avatar":"https://avatars.githubusercontent.com/u/153510?v=4"},"body":"Jonathan Nieder wrote:\n> diff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.txt\n> index 81ba296..01fc157 100644\n> --- a/Documentation/git-show-branch.txt\n> +++ b/Documentation/git-show-branch.txt\n> @@ -168,7 +168,7 @@ $ git show-branch master fixes mhf\n> ------------------------------------------------\n> \n> These three branches all forked from a common commit, [master],\n> -whose commit message is \"Add \\'git show-branch\\'\". The \"fixes\"\n> -branch adds one commit \"Introduce \"reset type\" flag to \"git reset\"\".\n> -The \"mhf\" branch adds many other commits. The current branch\n> -is \"master\".\n> +whose commit message is \"Add {apostrophe}git show-branch{apostrophe}\".\n> +The \"fixes\" branch adds one commit \"Introduce \"reset type\" flag to\n> +\"git reset\"\". The \"mhf\" branch adds many other commits.\n> +The current branch is \"master\".\n\nWhat does this apply on? I tried 'git am -3' but it says\n\n Applying: Documentation: remove stray backslash in show-branch discussion\n Using index info to reconstruct a base tree...\n error: patch failed: Documentation/git-show-branch.txt:168\n error: Documentation/git-show-branch.txt: patch does not apply\n Did you hand edit your patch?\n It does not apply to blobs recorded in its index.\n Cannot fall back to three-way merge.\n Patch failed at 0013 Documentation: remove stray backslash in show-branch discussion\n\n-- \nThomas Rast\ntrast@{inf,student}.ethz.ch\n"},{"id":"148743","messageId":"20100823113618.GA14959@kytes","threadId":"24801","inReplyTo":"201008231318.30768.trast@student.ethz.ch","subject":"Re: [PATCH 13/17] Documentation: remove stray backslash in show-branch discussion","fromName":"Ramkumar Ramachandra","fromEmail":"artagnon@gmail.com","sentAt":"2010-08-23T11:36:21Z","receivedAt":"2010-08-23T11:36:21Z","isPatch":true,"sender":{"key":"r@artagnon.com","avatar":"https://avatars.githubusercontent.com/u/37226?v=4"},"body":"Hi,\n\nThomas Rast writes:\n> Jonathan Nieder wrote:\n> > diff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.txt\n> > index 81ba296..01fc157 100644\n> > --- a/Documentation/git-show-branch.txt\n> > +++ b/Documentation/git-show-branch.txt\n> > @@ -168,7 +168,7 @@ $ git show-branch master fixes mhf\n> > ------------------------------------------------\n> > \n> > These three branches all forked from a common commit, [master],\n> > -whose commit message is \"Add \\'git show-branch\\'\". The \"fixes\"\n> > -branch adds one commit \"Introduce \"reset type\" flag to \"git reset\"\".\n> > -The \"mhf\" branch adds many other commits. The current branch\n> > -is \"master\".\n> > +whose commit message is \"Add {apostrophe}git show-branch{apostrophe}\".\n> > +The \"fixes\" branch adds one commit \"Introduce \"reset type\" flag to\n> > +\"git reset\"\". The \"mhf\" branch adds many other commits.\n> > +The current branch is \"master\".\n> \n> What does this apply on? I tried 'git am -3' but it says\n> \n> Applying: Documentation: remove stray backslash in show-branch discussion\n> Using index info to reconstruct a base tree...\n> error: patch failed: Documentation/git-show-branch.txt:168\n> error: Documentation/git-show-branch.txt: patch does not apply\n> Did you hand edit your patch?\n> It does not apply to blobs recorded in its index.\n> Cannot fall back to three-way merge.\n> Patch failed at 0013 Documentation: remove stray backslash in show-branch discussion\n\nThis series has already been merged into 'pu': jn/doc-backslash in\nd4394935b3. Did you try applying to 'master'?\n\n-- Ram\n"},{"id":"148744","messageId":"201008231351.01826.trast@student.ethz.ch","threadId":"24801","inReplyTo":"20100820101902.GA10356@burratino","subject":"Re: [RFC/PATCH 00/17] unexpected backslashes in man pages","fromName":"Thomas Rast","fromEmail":"trast@student.ethz.ch","sentAt":"2010-08-23T11:51:01Z","receivedAt":"2010-08-23T11:51:01Z","isPatch":true,"sender":{"key":"tr@thomasrast.ch","avatar":"https://avatars.githubusercontent.com/u/153510?v=4"},"body":"Jonathan Nieder wrote:\n> This series is longer than I would like, and I am not happy to\n> impose the review burden. So if something does not look obviously\n> correct at a glance, please let me know and I'll try to simplify it.\n> \n> The topic: as Frédéric Brière noticed in\n> , various man pages have collected\n> backslashes where they don't belong.\n\nApart from 13/17 which I was too lazy to fix manually, I have looked\nthrough all the results. The patches fix a lot of stray backslashes,\nexactly as claimed. For the record, this is on asciidoc 8.4.5 with\nASCIIDOC8=1 ASCIIDOC_NO_ROFF=1 GNU_ROFF=1.\n\nI did some random checking on a box with asciidoc 8.2.7, which is the\noldest that I have at hand. It seems to fix the issues there, too; in\nany case I didn't find any of the regressions that I wanted to check\nfor.\n\nSo,\n\n Acked-by: Thomas Rast \n\nfor the series.\n\n-- \nThomas Rast\ntrast@{inf,student}.ethz.ch\n"},{"id":"148795","messageId":"20100823224932.GA16573@burratino","threadId":"24801","inReplyTo":"201008231318.30768.trast@student.ethz.ch","subject":"Re: [PATCH 13/17] Documentation: remove stray backslash in show-branch discussion","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-08-23T22:49:32Z","receivedAt":"2010-08-23T22:49:32Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Thomas Rast wrote:\n\n> What does this apply on? I tried 'git am -3' but it says\n\nSorry about that. Hand-tweaking accident (I did not leave any\ntrailing context, so patch application tools are naturally not so\nhappy with it).\n\nThanks for the review!\n"}]}