From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Jacob Keller <jacob.keller@gmail.com>,
Stefan Beller <sbeller@google.com>,
"git\@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: [PATCH v2] diff: disable compaction heuristic for now
Date: Fri, 10 Jun 2016 13:55:01 -0700 [thread overview]
Message-ID: <xmqqk2hwepcq.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <xmqqoa78epmt.fsf_-_@gitster.mtv.corp.google.com> (Junio C. Hamano's message of "Fri, 10 Jun 2016 13:48:58 -0700")
Junio C Hamano <gitster@pobox.com> writes:
> Jeff King <peff@peff.net> writes:
>
> > We probably want a patch to the release notes to note that it's not on
> > by default. And we may want to advertise the experimental knob so
> > that people actually try it (otherwise we won't get feedback from the
> > masses).
>
> OK, I think that is sensible. The interdiff is not a strict
> reversion of 77085a61 (diff: undocument the compaction heuristic
> knobs for experimentation, 2016-05-02) but stresses that the
> feature is off by default and is experimental.
This is for 'master' when the topic is merged (will keep it in stash
for now).
Documentation/RelNotes/2.9.0.txt | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/Documentation/RelNotes/2.9.0.txt b/Documentation/RelNotes/2.9.0.txt
index 927cb9b..79b46e1 100644
--- a/Documentation/RelNotes/2.9.0.txt
+++ b/Documentation/RelNotes/2.9.0.txt
@@ -118,9 +118,11 @@ UI, Workflows & Features
* HTTP transport clients learned to throw extra HTTP headers at the
server, specified via http.extraHeader configuration variable.
- * Patch output from "git diff" and friends has been tweaked to be
- more readable by using a blank line as a strong hint that the
- contents before and after it belong to logically separate units.
+ * The "--compaction-heuristic" option to "git diff" family of
+ commands enables a heuristic to make the patch output more readable
+ by using a blank line as a strong hint that the contents before and
+ after it belong to logically separate units. It is still
+ experimental.
* A new configuration variable core.hooksPath allows customizing
where the hook directory is.
next prev parent reply other threads:[~2016-06-10 20:55 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-10 7:50 [BUG-ish] diff compaction heuristic false positive Jeff King
2016-06-10 8:31 ` Jeff King
2016-06-10 15:56 ` Junio C Hamano
2016-06-10 16:25 ` Stefan Beller
2016-06-10 16:29 ` Jacob Keller
2016-06-10 18:13 ` Re* " Junio C Hamano
2016-06-10 18:21 ` Stefan Beller
2016-06-10 20:30 ` Jeff King
2016-06-10 20:48 ` [PATCH v2] diff: disable compaction heuristic for now Junio C Hamano
2016-06-10 20:53 ` Jeff King
2016-06-10 20:55 ` Junio C Hamano [this message]
2016-06-10 21:05 ` Jeff King
2016-06-10 21:46 ` Junio C Hamano
2016-06-10 8:31 ` [BUG-ish] diff compaction heuristic false positive Michael Haggerty
2016-06-10 8:41 ` Jeff King
2016-06-10 11:00 ` Michael Haggerty
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=xmqqk2hwepcq.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jacob.keller@gmail.com \
--cc=peff@peff.net \
--cc=sbeller@google.com \
/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).