Thread (1 message) 1 message, 1 author, 2017-01-19

Re: problem with insider build for windows and git

From: Junio C Hamano <hidden>
Date: 2017-01-19 20:37:01

Johannes Schindelin [off-list ref] writes:
quoted
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
;-)
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help