summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-06-18 17:18:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-06-18 17:18:41 (GMT)
commitd676cc512a7aa17f6c7db53792c1e21c4ddfea42 (patch)
tree3b5a0469b3a22eecb3f387c9f4b03f0a98b32ffa /Documentation
parent1bd0e6779a3d6802826d2dc7b85b0ed009790bb6 (diff)
parent7eedad15df615e1a2e34cb76920d5c60e9f8d8dd (diff)
downloadgit-d676cc512a7aa17f6c7db53792c1e21c4ddfea42.zip
git-d676cc512a7aa17f6c7db53792c1e21c4ddfea42.tar.gz
git-d676cc512a7aa17f6c7db53792c1e21c4ddfea42.tar.bz2
Merge branch 'rd/diff-options-typofix'
Typofix. * rd/diff-options-typofix: diff-options.txt: fix minor typos, font inconsistencies, in docs
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/diff-options.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index f466600..30aad83 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[]