diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-11-27 12:33:28 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-27 12:33:28 +0900 |
| commit | 4886c778b44a0a4b9eb64392c58bf4ff20b4f587 (patch) | |
| tree | 08814376b93eb76988551e85a5a30a5e460c8adc /git-rebase.html | |
| parent | d71056015c147557a3bbf069107d9470c0579974 (diff) | |
| download | git-htmldocs-4886c778b44a0a4b9eb64392c58bf4ff20b4f587.tar.gz | |
Autogenerated HTML docs for v2.15.0-374-g5f995
Diffstat (limited to 'git-rebase.html')
| -rw-r--r-- | git-rebase.html | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/git-rebase.html b/git-rebase.html index 527c3a4cf..d2626ea2f 100644 --- a/git-rebase.html +++ b/git-rebase.html @@ -1500,13 +1500,16 @@ ignore-all-space <dt class="hdlist1">
ignore-space-at-eol
</dt>
+<dt class="hdlist1">
+ignore-cr-at-eol
+</dt>
<dd>
<p>
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 <a href="git-diff.html">git-diff(1)</a> <code>-b</code>, <code>-w</code>, and
- <code>--ignore-space-at-eol</code>.
+ See also <a href="git-diff.html">git-diff(1)</a> <code>-b</code>, <code>-w</code>,
+ <code>--ignore-space-at-eol</code>, and <code>--ignore-cr-at-eol</code>.
</p>
<div class="ulist"><ul>
<li>
|