From: Junio C Hamano <gitster@pobox.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Michael Gooch <goochmi@gmail.com>, git@vger.kernel.org
Subject: Re: problem with insider build for windows and git
Date: Thu, 19 Jan 2017 12:32:38 -0800 [thread overview]
Message-ID: <xmqqshoezt7d.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <alpine.DEB.2.20.1701192032330.3469@virtualbox> (Johannes Schindelin's message of "Thu, 19 Jan 2017 20:54:02 +0100 (CET)")
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
>> are there any other topic that are already in 'master' that should go to
>> 2.11.x track?
>
> Personally, I would have merged 'nd/config-misc-fixes' into `maint`, I
> guess, and 'jc/abbrev-autoscale-config', and probably also 'jc/latin-1'.
The "almost ready" pushout were merging the ones that have been in
'master' for weeks (including that mingw-isatty topic). These three
are still on radar, but they were too young and that was the only
reason why they were not included in the batch.
> The 'rj/git-version-gen-do-not-force-abbrev' topic would be another
> candidate for inclusion. The 'ah/grammos' strikes me as obvious `maint`
> material, as well as 'ew/svn-fixes'.
I am holding back rj/git-version-gen-do-not-force-abbrev from 2.11.x
before 2.12 is released because I am a bit reluctant to tweak the
release infractructure in 'maint', before the same tweak hits
'master' and produces a release.
The second one will involve translators and that is why it is not
marked for back-merging in the draft release notes.
I agree that the svn thing should have been merged to 'maint' in
that batch, but I missed it.
> Having said that, these are the topics that *I* would merge into `maint`
> if I maintained Git. I don't, so this is just my opinion, man [*1*].
Yes, your opinion was exactly what was requested, and you gave one
;-)
prev parent reply other threads:[~2017-01-19 20:36 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-12 16:21 problem with insider build for windows and git Michael Gooch
2017-01-14 18:09 ` Johannes Schindelin
2017-01-18 16:41 ` Johannes Schindelin
2017-01-18 18:32 ` Junio C Hamano
2017-01-19 19:54 ` Johannes Schindelin
2017-01-19 20:32 ` 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=xmqqshoezt7d.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=goochmi@gmail.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).