diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-06-18 11:32:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-06-18 11:32:19 -0700 |
| commit | 14e6683c9ffe288fd03fe38170e3d255056a7841 (patch) | |
| tree | a3248ef8aa66bb4132fd6442a25d39a151b8173b /git-show.html | |
| parent | 49bcf742a2710071f132cc7efcad8c4f4d7f0984 (diff) | |
| download | git-htmldocs-14e6683c9ffe288fd03fe38170e3d255056a7841.tar.gz | |
Autogenerated HTML docs for v2.18.0-rc2-76-g242ba
Diffstat (limited to 'git-show.html')
| -rw-r--r-- | git-show.html | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/git-show.html b/git-show.html index d47b7e3be..19ac074af 100644 --- a/git-show.html +++ b/git-show.html @@ -1561,7 +1561,7 @@ $ git log -2 --pretty=%h 4da45bef</code></pre> </dt>
<dd>
<p>
- 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.
</p>
</dd>
@@ -1657,7 +1657,7 @@ diff" algorithm internally.</p></div> </dd>
</dl></div>
</div></div>
-<div class="paragraph"><p>For instance, if you configured diff.algorithm variable to a
+<div class="paragraph"><p>For instance, if you configured the <code>diff.algorithm</code> variable to a
non-default value and want to use the default one, then you
have to use <code>--diff-algorithm=default</code> option.</p></div>
</dd>
@@ -2055,7 +2055,7 @@ override configuration settings.</p></div> Warn if changes introduce conflict markers or whitespace errors.
What are considered whitespace errors is controlled by <code>core.whitespace</code>
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
@@ -2074,7 +2074,7 @@ override configuration settings.</p></div> this option is not given, and the configuration variable
<code>diff.wsErrorHighlight</code> is not set, only whitespace errors in
<code>new</code> lines are highlighted. The whitespace errors are colored
- whith <code>color.diff.whitespace</code>.
+ with <code>color.diff.whitespace</code>.
</p>
</dd>
<dt class="hdlist1">
|