git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Junio C Hamano <gitster@pobox.com>
Date
Apr 21, 2016, 23:17 UTC
Message-ID
<xmqqk2jqr1pe.fsf@gitster.mtv.corp.google.com>
In-Reply-To
<20160421225739.GA7508@kitenet.net>
Joey Hess <id@joeyh.name> 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 of Git), configuration variables (which would encourage users to opt out of safety unconditionallly) and environment (which allows scripts to opt-in), I would say.

Previous: Joey HessNext: Joey Hess
Message 7 of 8 in “'next'ed --allow-unrelated-histories could cause lots of grief”
  1. Yaroslav HalchenkoApr 21, 2016
  2. Junio C HamanoApr 21, 2016
  3. Yaroslav HalchenkoApr 21, 2016
  4. Junio C HamanoApr 21, 2016
  5. Yaroslav HalchenkoApr 21, 2016
  6. Joey HessApr 21, 2016
  7. Junio C HamanoApr 21, 2016
  8. Joey HessApr 21, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.