summaryrefslogtreecommitdiff
path: root/Documentation/merge-strategies.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-10-26 06:32:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-11-08 01:05:27 (GMT)
commite9282f02b2f21118f3383608718e38efc3d967e1 (patch)
tree94a5166a027c9306b3d8eba594ea9b79347dc1c2 /Documentation/merge-strategies.txt
parent446d12cb3fbee1b641f97336df3abe8968e3db59 (diff)
downloadgit-e9282f02b2f21118f3383608718e38efc3d967e1.zip
git-e9282f02b2f21118f3383608718e38efc3d967e1.tar.gz
git-e9282f02b2f21118f3383608718e38efc3d967e1.tar.bz2
diff: --ignore-cr-at-eol
A new option --ignore-cr-at-eol tells the diff machinery to treat a carriage-return at the end of a (complete) line as if it does not exist. Just like other "--ignore-*" options to ignore various kinds of whitespace differences, this will help reviewing the real changes you made without getting distracted by spurious CRLF<->LF conversion made by your editor program. Helped-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> [jch: squashed in command line completion by Dscho] Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 2eb92b9..0307449 100644
--- a/Documentation/merge-strategies.txt
+++ b/Documentation/merge-strategies.txt
@@ -57,11 +57,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;