Re: [ANNOUNCE] Git v2.11.0

2016-11-29 Thread Junio C Hamano
Jeff King writes: > On Tue, Nov 29, 2016 at 01:21:51PM -0800, Junio C Hamano wrote: > >> The latest feature release Git v2.11.0 is now available at the >> usual places. It is comprised of 673 non-merge commits since >> v2.10.0, contributed by 74 people, 15 of which are new faces. >> [...] >> Jef

Re: [ANNOUNCE] Git v2.11.0

2016-11-29 Thread Jeff King
On Tue, Nov 29, 2016 at 01:21:51PM -0800, Junio C Hamano wrote: > The latest feature release Git v2.11.0 is now available at the > usual places. It is comprised of 673 non-merge commits since > v2.10.0, contributed by 74 people, 15 of which are new faces. > [...] > Jeff King (117): > [...] >

[ANNOUNCE] Git v2.11.0

2016-11-29 Thread Junio C Hamano
The latest feature release Git v2.11.0 is now available at the usual places. It is comprised of 673 non-merge commits since v2.10.0, contributed by 74 people, 15 of which are new faces. The tarballs are found at: https://www.kernel.org/pub/software/scm/git/ The following public repositories

Re: [ANNOUNCE] Git v2.11.0-rc3

2016-11-24 Thread Johannes Sixt
Am 24.11.2016 um 17:25 schrieb Marc Branchaud: On 2016-11-23 06:21 PM, Junio C Hamano wrote: * The original command line syntax for "git merge", which was "git merge HEAD ...", has been deprecated for quite some time, and "git gui" was the last in-tree user of the syntax. This is fi

Re: [ANNOUNCE] Git v2.11.0-rc3

2016-11-24 Thread Marc Branchaud
On 2016-11-23 06:21 PM, Junio C Hamano wrote: * The original command line syntax for "git merge", which was "git merge HEAD ...", has been deprecated for quite some time, and "git gui" was the last in-tree user of the syntax. This is finally fixed, so that we can move forward with th

[ANNOUNCE] Git v2.11.0-rc3

2016-11-23 Thread Junio C Hamano
A release candidate Git v2.11.0-rc3 is now available for testing at the usual places. It is comprised of 666 non-merge commits since v2.10.0, contributed by 73 people, 15 of which are new faces. It turns out that one recent fix exposed codepaths that have not been using the API correctly, resulti

[ANNOUNCE] Git v2.11.0-rc2

2016-11-17 Thread Junio C Hamano
A release candidate Git v2.11.0-rc2 is now available for testing at the usual places. It is comprised of 646 non-merge commits since v2.10.0, contributed by 68 people, 14 of which are new faces. The tarballs are found at: https://www.kernel.org/pub/software/scm/git/testing/ The following pu

[ANNOUNCE] Git v2.11.0-rc1

2016-11-11 Thread Junio C Hamano
A release candidate Git v2.11.0-rc1 is now available for testing at the usual places. It is comprised of 642 non-merge commits since v2.10.0, contributed by 66 people, 14 of which are new faces. Due to the last-minute fixups and timezone differences, there might be a few more updates to test scri

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