Re: 'next'ed --allow-unrelated-histories could cause lots of grief

Joey Hess writes: > Junio C Hamano wrote: >> merge: GIT_MERGE_ALLOW_UNRELATED_HISTORIES environment > > I hope this patch lands, it will save me a lot of bother. Yup, it is somewhat ugly but the least bad option among command line option (which would break with older versions

Re: 'next'ed --allow-unrelated-histories could cause lots of grief

Yaroslav Halchenko wrote: > - for git-annex (Joey was CCed from the beginning, not sure if annex > would be affected though), it would be merging of git-annex > branches while joining multiple annexes for the sync (e.g. by git > annex assistant). Not entirely accurate (git-annex merges its

Re: 'next'ed --allow-unrelated-histories could cause lots of grief

On Thu, 21 Apr 2016, Junio C Hamano wrote: > >> It is not very productive to make such an emotional statement > >> without substantiating _why_ a merge that adds a new root, which was > >> declared in the thread above as "crap" (in the context of the kernel > >> project), > > Sorry if my

Re: 'next'ed --allow-unrelated-histories could cause lots of grief

Yaroslav Halchenko writes: >> It is not very productive to make such an emotional statement >> without substantiating _why_ a merge that adds a new root, which was >> declared in the thread above as "crap" (in the context of the kernel >> project), > > Sorry if my statement

Re: 'next'ed --allow-unrelated-histories could cause lots of grief

On Thu, 21 Apr 2016, Junio C Hamano wrote: > Yaroslav Halchenko writes: > > I have decided to try 2.8.1.369.geae769a available from debian > > experimental and through our (datalad) tests failing I became > > aware of the > > > >

Re: 'next'ed --allow-unrelated-histories could cause lots of grief

Yaroslav Halchenko wrote: > which is planned for the next release. I guess it is indeed a > worthwhile accident-prevention measure BUT not sure if it is so > important as to cause a change in behavior on which some projects using > git through the cmdline interface might have been relying upon

Re: 'next'ed --allow-unrelated-histories could cause lots of grief

Yaroslav Halchenko writes: > I have decided to try 2.8.1.369.geae769a available from debian > experimental and through our (datalad) tests failing I became > aware of the > > > https://github.com/git/git/pull/158/commits/e379fdf34fee96cd205be83ff4e71699bdc32b18 >

'next'ed --allow-unrelated-histories could cause lots of grief

Dear Git Gurus, I guess whenever it rains it indeed pours, so it is me whining again. I have decided to try 2.8.1.369.geae769a available from debian experimental and through our (datalad) tests failing I became aware of the