From: Stefan Beller <sbeller@google.com>
To: "Robert P. J. Day" <rpjday@crashcourse.ca>
Cc: git <git@vger.kernel.org>
Subject: Re: [PATCH] diff-options.txt: fix minor typos, font inconsistencies, in docs
Date: Mon, 11 Jun 2018 14:31:37 -0700 [thread overview]
Message-ID: <CAGZ79kYh2An4GXH3EQiXtNfCEaCMnHdWa9pt8k=d6FP1JM_+iQ@mail.gmail.com> (raw)
In-Reply-To: <alpine.LFD.2.21.1806110954470.14784@localhost.localdomain>
On Mon, Jun 11, 2018 at 6:58 AM Robert P. J. Day <rpjday@crashcourse.ca> wrote:
>
> Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
The code is
Reviewed-by: Stefan Beller <sbeller@google.com>
Is this patch missing three dashes between commit message and the patch itself?
How did you send this patch?
>
> diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
> index f466600972..30aad8396d 100644
> --- a/Documentation/diff-options.txt
> +++ b/Documentation/diff-options.txt
> @@ -64,7 +64,7 @@ ifndef::git-format-patch[]
> endif::git-format-patch[]
>
> --indent-heuristic::
> - Enable the heuristic that shift diff hunk boundaries to make patches
> + Enable the heuristic that shifts diff hunk boundaries to make patches
> easier to read. This is the default.
>
> --no-indent-heuristic::
> @@ -106,7 +106,7 @@ diff" algorithm internally.
> low-occurrence common elements".
> --
> +
> -For instance, if you configured diff.algorithm variable to a
> +For instance, if you configured the `diff.algorithm` variable to a
> non-default value and want to use the default one, then you
> have to use `--diff-algorithm=default` option.
>
> @@ -350,7 +350,7 @@ ifndef::git-format-patch[]
> Warn if changes introduce conflict markers or whitespace errors.
> What are considered whitespace errors is controlled by `core.whitespace`
> configuration. By default, trailing whitespaces (including
> - lines that solely consist of whitespaces) and a space character
> + lines that consist solely of whitespaces) and a space character
> that is immediately followed by a tab character inside the
> initial indent of the line are considered whitespace errors.
> Exits with non-zero status if problems are found. Not compatible
> @@ -364,7 +364,7 @@ ifndef::git-format-patch[]
> this option is not given, and the configuration variable
> `diff.wsErrorHighlight` is not set, only whitespace errors in
> `new` lines are highlighted. The whitespace errors are colored
> - whith `color.diff.whitespace`.
> + with `color.diff.whitespace`.
>
> endif::git-format-patch[]
prev parent reply other threads:[~2018-06-11 21:31 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-11 13:56 [PATCH] diff-options.txt: fix minor typos, font inconsistencies, in docs Robert P. J. Day
2018-06-11 21:31 ` Stefan Beller [this message]
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAGZ79kYh2An4GXH3EQiXtNfCEaCMnHdWa9pt8k=d6FP1JM_+iQ@mail.gmail.com' \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
--cc=rpjday@crashcourse.ca \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).