Re: [ANNOUNCE] Git v2.11.0-rc0

2016-11-02 Thread Michael Haggerty
On 11/01/2016 10:38 PM, Junio C Hamano wrote: > Junio C Hamano writes: > >> If it involves renaming and swapping, however, we may be talking >> about a change that we cannot deliver with confidence in less than a >> week before -rc1, which sounds, eh, suboptimal. >> >> FWIW, here is how the remov

Re: [ANNOUNCE] Git v2.11.0-rc0

2016-11-01 Thread Jacob Keller
On Tue, Nov 1, 2016 at 2:10 PM, Stefan Beller wrote: > On Tue, Nov 1, 2016 at 1:59 PM, Jeff King wrote: >> On Tue, Nov 01, 2016 at 01:56:34PM -0700, Junio C Hamano wrote: >> >>> > As of -rc0, we have both --indent-heuristic and --compaction-heuristic >>> > (along with matching config), and they a

Re: [ANNOUNCE] Git v2.11.0-rc0

2016-11-01 Thread Junio C Hamano
Stefan Beller writes: >> -diff.indentHeuristic:: >> diff.compactionHeuristic:: >> Set one of these options to `true` to enable one of two >> experimental heuristics that shift diff hunk boundaries to > > We would need to reword this as well, as there will be only one heuristic >

Re: [ANNOUNCE] Git v2.11.0-rc0

2016-11-01 Thread Jeff King
On Tue, Nov 01, 2016 at 02:45:19PM -0700, Junio C Hamano wrote: > Junio C Hamano writes: > > > And here is _with_ renaming. I think "compaction heuristics" is a > > much better phrase to call "heuristics used during the diff hunk > > compaction process" without specifying how that heuristics wo

Re: [ANNOUNCE] Git v2.11.0-rc0

2016-11-01 Thread Junio C Hamano
Junio C Hamano writes: > And here is _with_ renaming. I think "compaction heuristics" is a > much better phrase to call "heuristics used during the diff hunk > compaction process" without specifying how that heuristics work > (like taking hints in the indentation levels). If we are to retire >

Re: [ANNOUNCE] Git v2.11.0-rc0

2016-11-01 Thread Stefan Beller
On Tue, Nov 1, 2016 at 2:38 PM, Junio C Hamano wrote: > > -diff.indentHeuristic:: > diff.compactionHeuristic:: > Set one of these options to `true` to enable one of two > experimental heuristics that shift diff hunk boundaries to We would need to reword this as well, as there w

Re: [ANNOUNCE] Git v2.11.0-rc0

2016-11-01 Thread Junio C Hamano
Junio C Hamano writes: > If it involves renaming and swapping, however, we may be talking > about a change that we cannot deliver with confidence in less than a > week before -rc1, which sounds, eh, suboptimal. > > FWIW, here is how the removal of compaction without renaming looks > like. And he

Re: [ANNOUNCE] Git v2.11.0-rc0

2016-11-01 Thread Stefan Beller
On Tue, Nov 1, 2016 at 1:59 PM, Jeff King wrote: > On Tue, Nov 01, 2016 at 01:56:34PM -0700, Junio C Hamano wrote: > >> > As of -rc0, we have both --indent-heuristic and --compaction-heuristic >> > (along with matching config), and they are mutually exclusive. >> > >> > In [1], Stefan suggested ju

Re: [ANNOUNCE] Git v2.11.0-rc0

2016-11-01 Thread Junio C Hamano
Jeff King writes: > We've already released a version with --compaction-heuristic, so we are > stuck keeping it forever either way. While I do not necessarily agree with this conclusion (we've already released it labelled as experimental; can't we freely take it away?), that may be of lessor impa

Re: [ANNOUNCE] Git v2.11.0-rc0

2016-11-01 Thread Jeff King
On Tue, Nov 01, 2016 at 01:56:34PM -0700, Junio C Hamano wrote: > > As of -rc0, we have both --indent-heuristic and --compaction-heuristic > > (along with matching config), and they are mutually exclusive. > > > > In [1], Stefan suggested just replacing the compaction heuristic > > entirely with t

Re: [ANNOUNCE] Git v2.11.0-rc0

2016-11-01 Thread Junio C Hamano
Jeff King writes: > On Mon, Oct 31, 2016 at 02:49:42PM -0700, Junio C Hamano wrote: > >> * Output from "git diff" can be made easier to read by selecting >>which lines are common and which lines are added/deleted >>intelligently when the lines before and after the changed section >>a

Re: [ANNOUNCE] Git v2.11.0-rc0

2016-11-01 Thread Stefan Beller
> * "git clone --resurse-submodules --reference $path $URL" is a way to "recurse"

Re: [ANNOUNCE] Git v2.11.0-rc0

2016-11-01 Thread Jeff King
On Mon, Oct 31, 2016 at 02:49:42PM -0700, Junio C Hamano wrote: > * Output from "git diff" can be made easier to read by selecting >which lines are common and which lines are added/deleted >intelligently when the lines before and after the changed section >are the same. A command lin

Re: [ANNOUNCE] Git v2.11.0-rc0

2016-11-01 Thread Patrick Steinhardt
Hi Junio, On Mon, Oct 31, 2016 at 02:49:42PM -0700, Junio C Hamano wrote: [snip] > * In some projects, it is common to use "[RFC PATCH]" as the subject >prefix for a patch meant for discussion rather than application. A >new option "--rfc" was a short-hand for "--subject-prefix=RFC PATCH

Re: [ANNOUNCE] Git v2.11.0-rc0

2016-10-31 Thread Simon Ruderich
On Mon, Oct 31, 2016 at 02:49:42PM -0700, Junio C Hamano wrote: > [snip] Hello, I noticed a few minor typos in the changelog. > * The default abbreviation length, which has historically been 7, now >scales as the repository grows, using the approximate number of >objects in the reopsito

[ANNOUNCE] Git v2.11.0-rc0

2016-10-31 Thread Junio C Hamano
An early preview release Git v2.11.0-rc0 is now available for testing at the usual places. It is comprised of 617 non-merge commits since v2.10.0, contributed by 64 people, 14 of which are new faces. An updated, slightly slipped from the original, schedule is found at http://tinyurl.com/gitCal an