summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-11-27 11:06:31 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-11-27 11:06:31 +0900
commit10f65c239a885336b745cc9d2e1654980ffef41e (patch)
treef10ffd064f85e27f3ff8b64e0d26e179df8bca77 /Documentation
parentSync with maint (diff)
parentdiff: --ignore-cr-at-eol (diff)
downloadtgif-10f65c239a885336b745cc9d2e1654980ffef41e.tar.xz
Merge branch 'jc/ignore-cr-at-eol'
The "diff" family of commands learned to ignore differences in carriage return at the end of line. * jc/ignore-cr-at-eol: diff: --ignore-cr-at-eol xdiff: reassign xpparm_t.flags bits
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/diff-options.txt3
-rw-r--r--Documentation/merge-strategies.txt5
2 files changed, 6 insertions, 2 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index dd0dba5b1d..3c93c21683 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -557,6 +557,9 @@ endif::git-format-patch[]
--text::
Treat all files as text.
+--ignore-cr-at-eol::
+ Ignore carrige-return at the end of line when doing a comparison.
+
--ignore-space-at-eol::
Ignore changes in whitespace at EOL.
diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt
index a09d597463..fd5d748d1b 100644
--- a/Documentation/merge-strategies.txt
+++ b/Documentation/merge-strategies.txt
@@ -58,11 +58,12 @@ diff-algorithm=[patience|minimal|histogram|myers];;
ignore-space-change;;
ignore-all-space;;
ignore-space-at-eol;;
+ignore-cr-at-eol;;
Treats lines with the indicated type of whitespace change as
unchanged for the sake of a three-way merge. Whitespace
changes mixed with other changes to a line are not ignored.
- See also linkgit:git-diff[1] `-b`, `-w`, and
- `--ignore-space-at-eol`.
+ See also linkgit:git-diff[1] `-b`, `-w`,
+ `--ignore-space-at-eol`, and `--ignore-cr-at-eol`.
+
* If 'their' version only introduces whitespace changes to a line,
'our' version is used;