git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: "Carlos Martín Nieto" <cmn@dwim.me>
Cc: git@vger.kernel.org, Michael Haggerty <mhagger@alum.mit.edu>
Subject: Re: [PATCH] diff: --indent-heuristic is no longer experimental
Date: Wed, 01 Nov 2017 15:14:20 +0900	[thread overview]
Message-ID: <xmqqk1zattj7.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <xmqq1sljzt2i.fsf@gitster.mtv.corp.google.com> (Junio C. Hamano's message of "Tue, 31 Oct 2017 16:15:33 +0900")

Junio C Hamano <gitster@pobox.com> writes:

> Carlos Martín Nieto <cmn@dwim.me> 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 <cmn@dwim.me>
>> ---
>>  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
>
> I suspect that this patch is incomplete.  The build procedure barfs
> and dies while making git-annotate.html, claiming that it wants to
> find diff-heuristic-options.txt that no longer exists.

The fix is obvious once you have time to sip your tea and look at
the output from "git grep" ;-)

Subject: [PATCH] SQUASH???

---
 Documentation/git-annotate.txt | 1 -
 Documentation/git-blame.txt    | 2 --
 2 files changed, 3 deletions(-)

diff --git a/Documentation/git-annotate.txt b/Documentation/git-annotate.txt
index 94be4b85e0..05fd482b74 100644
--- a/Documentation/git-annotate.txt
+++ b/Documentation/git-annotate.txt
@@ -23,7 +23,6 @@ familiar command name for people coming from other SCM systems.
 OPTIONS
 -------
 include::blame-options.txt[]
-include::diff-heuristic-options.txt[]
 
 SEE ALSO
 --------
diff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt
index fdc3aea30a..16323eb80e 100644
--- a/Documentation/git-blame.txt
+++ b/Documentation/git-blame.txt
@@ -89,8 +89,6 @@ include::blame-options.txt[]
 	abbreviated object name, use <n>+1 digits. Note that 1 column
 	is used for a caret to mark the boundary commit.
 
-include::diff-heuristic-options.txt[]
-
 
 THE PORCELAIN FORMAT
 --------------------
-- 
2.15.0-206-g5fb43f7f39


      reply	other threads:[~2017-11-01  6:14 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-10-29 15:12 [PATCH] diff: --indent-heuristic is no longer experimental Carlos Martín Nieto
2017-10-30 17:40 ` Stefan Beller
2017-10-31  5:24 ` Junio C Hamano
2017-10-31  7:15 ` Junio C Hamano
2017-11-01  6:14   ` Junio C Hamano [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqk1zattj7.fsf@gitster.mtv.corp.google.com \
    --to=gitster@pobox.com \
    --cc=cmn@dwim.me \
    --cc=git@vger.kernel.org \
    --cc=mhagger@alum.mit.edu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).