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

Re: [PATCH 2/4] pull: pass --allow-unrelated-histories to "git merge"

From
Stefan Beller <sbeller@google.com>
Date
Apr 21, 2016, 19:36 UTC
Message-ID
<CAGZ79kZgenHyvAKxKNGxKkybM=LgTfsvB7s91s1sQxxbp1xoFg@mail.gmail.com>
In-Reply-To
<20160421192500.23563-3-gitster@pobox.com>
On Thu, Apr 21, 2016 at 12:24 PM, Junio C Hamano <gitster@pobox.com> wrote:
> An earlier commit said:

And by earlier you meant to say e379fdf34f (2016-03-18, merge: refuse to create too cool a merge by default)?

Previous: Junio C HamanoNext: Junio C Hamano
Message 4 of 8 in “Loosening "two project merge" safety”
  1. 0/4 Loosening "two project merge" safetyJunio C Hamano, Apr 21, 2016
  2. 1/4 t3033: avoid 'ambiguous refs' warningJunio C Hamano, Apr 21, 2016
  3. 2/4 pull: pass --allow-unrelated-histories to "git merge"Junio C Hamano, Apr 21, 2016
  4. Stefan BellerApr 21, 2016
  5. Junio C HamanoApr 21, 2016
  6. 3/4 merge: GIT_MERGE_ALLOW_UNRELATED_HISTORIES environmentJunio C Hamano, Apr 21, 2016
  7. 4/4 merge: introduce merge.allowUnrelatedhistories configuration optionJunio C Hamano, Apr 21, 2016
  8. Junio C HamanoApr 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.