{"thread":{"id":"48689","subject":"[PATCH] diff-options.txt: fix minor typos, font inconsistencies, in docs","startedAt":"2018-06-11T13:58:44Z","lastAt":"2018-06-11T21:31:52Z","messageCount":2,"participants":["Robert P. J. Day","Stefan Beller"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"349896","messageId":"alpine.LFD.2.21.1806110954470.14784@localhost.localdomain","threadId":"48689","inReplyTo":null,"subject":"[PATCH] diff-options.txt: fix minor typos, font inconsistencies, in docs","fromName":"Robert P. J. Day","fromEmail":"rpjday@crashcourse.ca","sentAt":"2018-06-11T13:56:13Z","receivedAt":"2018-06-11T13:58:44Z","isPatch":true,"sender":{"key":"rpjday@crashcourse.ca","avatar":"https://avatars.githubusercontent.com/u/226084077?v=4"},"body":"Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>\n\ndiff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt\nindex f466600972..30aad8396d 100644\n--- a/Documentation/diff-options.txt\n+++ b/Documentation/diff-options.txt\n@@ -64,7 +64,7 @@ ifndef::git-format-patch[]\n endif::git-format-patch[]\n\n --indent-heuristic::\n-\tEnable the heuristic that shift diff hunk boundaries to make patches\n+\tEnable the heuristic that shifts diff hunk boundaries to make patches\n \teasier to read. This is the default.\n\n --no-indent-heuristic::\n@@ -106,7 +106,7 @@ diff\" algorithm internally.\n \tlow-occurrence common elements\".\n --\n +\n-For instance, if you configured diff.algorithm variable to a\n+For instance, if you configured the `diff.algorithm` variable to a\n non-default value and want to use the default one, then you\n have to use `--diff-algorithm=default` option.\n\n@@ -350,7 +350,7 @@ ifndef::git-format-patch[]\n \tWarn if changes introduce conflict markers or whitespace errors.\n \tWhat are considered whitespace errors is controlled by `core.whitespace`\n \tconfiguration.  By default, trailing whitespaces (including\n-\tlines that solely consist of whitespaces) and a space character\n+\tlines that consist solely of whitespaces) and a space character\n \tthat is immediately followed by a tab character inside the\n \tinitial indent of the line are considered whitespace errors.\n \tExits with non-zero status if problems are found. Not compatible\n@@ -364,7 +364,7 @@ ifndef::git-format-patch[]\n \tthis option is not given, and the configuration variable\n \t`diff.wsErrorHighlight` is not set, only whitespace errors in\n \t`new` lines are highlighted. The whitespace errors are colored\n-\twhith `color.diff.whitespace`.\n+\twith `color.diff.whitespace`.\n\n endif::git-format-patch[]\n\nrday\n\n-- \n\n========================================================================\nRobert P. J. Day                                 Ottawa, Ontario, CANADA\n                  http://crashcourse.ca/dokuwiki\n\nTwitter:                                       http://twitter.com/rpjday\nLinkedIn:                               http://ca.linkedin.com/in/rpjday\n========================================================================\n"},{"id":"349945","messageId":"CAGZ79kYh2An4GXH3EQiXtNfCEaCMnHdWa9pt8k=d6FP1JM_+iQ@mail.gmail.com","threadId":"48689","inReplyTo":"alpine.LFD.2.21.1806110954470.14784@localhost.localdomain","subject":"Re: [PATCH] diff-options.txt: fix minor typos, font inconsistencies, in docs","fromName":"Stefan Beller","fromEmail":"sbeller@google.com","sentAt":"2018-06-11T21:31:37Z","receivedAt":"2018-06-11T21:31:52Z","isPatch":true,"sender":{"key":"stefanbeller@gmail.com","avatar":"https://avatars.githubusercontent.com/u/455868?v=4"},"body":"On Mon, Jun 11, 2018 at 6:58 AM Robert P. J. Day <rpjday@crashcourse.ca> wrote:\n>\n> Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>\n\nThe code is\nReviewed-by: Stefan Beller <sbeller@google.com>\n\nIs this patch missing three dashes between commit message and the patch itself?\nHow did you send this patch?\n\n>\n> diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt\n> index f466600972..30aad8396d 100644\n> --- a/Documentation/diff-options.txt\n> +++ b/Documentation/diff-options.txt\n> @@ -64,7 +64,7 @@ ifndef::git-format-patch[]\n>  endif::git-format-patch[]\n>\n>  --indent-heuristic::\n> -       Enable the heuristic that shift diff hunk boundaries to make patches\n> +       Enable the heuristic that shifts diff hunk boundaries to make patches\n>         easier to read. This is the default.\n>\n>  --no-indent-heuristic::\n> @@ -106,7 +106,7 @@ diff\" algorithm internally.\n>         low-occurrence common elements\".\n>  --\n>  +\n> -For instance, if you configured diff.algorithm variable to a\n> +For instance, if you configured the `diff.algorithm` variable to a\n>  non-default value and want to use the default one, then you\n>  have to use `--diff-algorithm=default` option.\n>\n> @@ -350,7 +350,7 @@ ifndef::git-format-patch[]\n>         Warn if changes introduce conflict markers or whitespace errors.\n>         What are considered whitespace errors is controlled by `core.whitespace`\n>         configuration.  By default, trailing whitespaces (including\n> -       lines that solely consist of whitespaces) and a space character\n> +       lines that consist solely of whitespaces) and a space character\n>         that is immediately followed by a tab character inside the\n>         initial indent of the line are considered whitespace errors.\n>         Exits with non-zero status if problems are found. Not compatible\n> @@ -364,7 +364,7 @@ ifndef::git-format-patch[]\n>         this option is not given, and the configuration variable\n>         `diff.wsErrorHighlight` is not set, only whitespace errors in\n>         `new` lines are highlighted. The whitespace errors are colored\n> -       whith `color.diff.whitespace`.\n> +       with `color.diff.whitespace`.\n>\n>  endif::git-format-patch[]\n"}]}