summaryrefslogtreecommitdiff
path: root/Documentation/diff-options.txt
diff options
context:
space:
mode:
authorRobert P. J. Day <rpjday@crashcourse.ca>2018-06-11 13:56:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-06-11 20:11:09 (GMT)
commit7eedad15df615e1a2e34cb76920d5c60e9f8d8dd (patch)
tree04d0bb586cc2a31c3350c6dd69f65fec95304767 /Documentation/diff-options.txt
parentd33c87517a85f544159b2efa406136dde18a5b9f (diff)
downloadgit-7eedad15df615e1a2e34cb76920d5c60e9f8d8dd.zip
git-7eedad15df615e1a2e34cb76920d5c60e9f8d8dd.tar.gz
git-7eedad15df615e1a2e34cb76920d5c60e9f8d8dd.tar.bz2
diff-options.txt: fix minor typos, font inconsistencies, in docs
Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/diff-options.txt')
-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 dd0dba5..6c7a56c 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::
@@ -96,7 +96,7 @@ endif::git-format-patch[]
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.
@@ -332,7 +332,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
@@ -346,7 +346,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[]