Re: [PATCH] diff-options.txt: fix minor typos, font inconsistencies, in docs
- Date: Mon, 11 Jun 2018 14:31:37 -0700
- From: Stefan Beller <sbeller@xxxxxxxxxx>
- Subject: Re: [PATCH] diff-options.txt: fix minor typos, font inconsistencies, in docs
On Mon, Jun 11, 2018 at 6:58 AM Robert P. J. Day <rpjday@xxxxxxxxxxxxxx> wrote:
> Signed-off-by: Robert P. J. Day <rpjday@xxxxxxxxxxxxxx>
The code is
Reviewed-by: Stefan Beller <sbeller@xxxxxxxxxx>
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
> - 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.
> @@ -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`.