summaryrefslogtreecommitdiff
path: root/Documentation/merge-strategies.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-11-27 02:06:31 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-11-27 02:06:31 (GMT)
commit10f65c239a885336b745cc9d2e1654980ffef41e (patch)
treef10ffd064f85e27f3ff8b64e0d26e179df8bca77 /Documentation/merge-strategies.txt
parent14c63a9dc093d6738454f6369a4f5663ca732cf7 (diff)
parente9282f02b2f21118f3383608718e38efc3d967e1 (diff)
downloadgit-10f65c239a885336b745cc9d2e1654980ffef41e.zip
git-10f65c239a885336b745cc9d2e1654980ffef41e.tar.gz
git-10f65c239a885336b745cc9d2e1654980ffef41e.tar.bz2
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/merge-strategies.txt')
-rw-r--r--Documentation/merge-strategies.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt
index a09d597..fd5d748 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;