Carlos Martín Nieto <[email protected]> writes: > This heuristic has been the default since 2.14 so we should not confuse our > users by saying that it's experimental and off by default. > > Signed-off-by: Carlos Martín Nieto <[email protected]> > ---
Good eyes. Nobody raised noises since this happened at 2.14 until now, so this could wait until the next cycle, though ;-) > Documentation/diff-heuristic-options.txt | 5 ----- > Documentation/diff-options.txt | 7 ++++++- > 2 files changed, 6 insertions(+), 6 deletions(-) > delete mode 100644 Documentation/diff-heuristic-options.txt > > diff --git a/Documentation/diff-heuristic-options.txt > b/Documentation/diff-heuristic-options.txt > deleted file mode 100644 > index d4f3d95505..0000000000 > --- a/Documentation/diff-heuristic-options.txt > +++ /dev/null > @@ -1,5 +0,0 @@ > ---indent-heuristic:: > ---no-indent-heuristic:: > - These are to help debugging and tuning experimental heuristics > - (which are off by default) that shift diff hunk boundaries to > - make patches easier to read. > diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt > index a88c76741e..dd0dba5b1d 100644 > --- a/Documentation/diff-options.txt > +++ b/Documentation/diff-options.txt > @@ -63,7 +63,12 @@ ifndef::git-format-patch[] > Synonym for `-p --raw`. > endif::git-format-patch[] > > -include::diff-heuristic-options.txt[] > +--indent-heuristic:: > + Enable the heuristic that shift diff hunk boundaries to make patches > + easier to read. This is the default. > + > +--no-indent-heuristic:: > + Disable the indent heuristic. > > --minimal:: > Spend extra time to make sure the smallest possible
