From: Simon Ruderich Date: Fri, 18 May 2018 04:00:06 GMT Subject: Re: [PATCH 6/8] diff.c: decouple white space treatment from move detection algorithm Message-ID: <20180518040006.GA31451@ruderich.org> In-Reply-To: <20180517194653.48928-7-sbeller@google.com> On Thu, May 17, 2018 at 12:46:51PM -0700, Stefan Beller wrote: > diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt > index bb9f1b7cd82..7b2527b9a19 100644 > --- a/Documentation/diff-options.txt > +++ b/Documentation/diff-options.txt > @@ -292,6 +292,19 @@ dimmed_zebra:: > blocks are considered interesting, the rest is uninteresting. > -- > > +--color-moved-[no-]ignore-space-at-eol:: > + Ignore changes in whitespace at EOL when performing the move > + detection for --color-moved. > +--color-moved-[no-]ignore-space-change:: > + Ignore changes in amount of whitespace when performing the move > + detection for --color-moved. This ignores whitespace > + at line end, and considers all other sequences of one or > + more whitespace characters to be equivalent. > +--color-moved-[no-]ignore-all-space:: > + Ignore whitespace when comparing lines when performing the move > + detection for --color-moved. This ignores differences even if > + one line has whitespace where the other line has none. > + > --word-diff[=]:: > Show a word diff, using the to delimit changed words. > By default, words are delimited by whitespace; see Hello, I think it would be better to specify the options unabbreviated. Not being able to search the man page for "--color-moved-ignore-space-at-eol" or "--color-moved-no-ignore-space-at-eol" can be a major pain when looking for documentation. So maybe something like this instead: > +--color-moved-ignore-space-at-eol:: > +--color-moved-no-ignore-space-at-eol:: > + Ignore changes in whitespace at EOL when performing the move > + detection for --color-moved. Regards Simon -- + privacy is necessary + using gnupg http://gnupg.org + public key id: 0x92FEFDB7E44C32F9