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

Re: What's cooking in git.git (Dec 2020, #03; Fri, 18)

From
Elijah Newren <newren@gmail.com>
Date
Dec 21, 2020, 17:25 UTC
Message-ID
<CABPp-BErnY+zfmp-LWTe0EUB5QKKcLCP=4t9VxwvA_+DaBvDuw@mail.gmail.com>
In-Reply-To
<xmqqblepnd9k.fsf@gitster.c.googlers.com>
On Sat, Dec 19, 2020 at 11:32 PM Junio C Hamano <gitster@pobox.com> wrote:
Show 9 quoted lines
>
> Elijah Newren <newren@gmail.com> writes:
>
> > What do you mean when you say these two topics are tangled?
>
> When two topics are "one builds on top of the whole of the other",
> my tool labels "uses" vs "is used by".  All other cases where two
> topics share a commit are labeled as "tangled", as I couldn't come
> up with any better phrase.

I'm still confused. en/merge-ort-3 and en/merge-ort-recursive do not share any commits. The only tie is that each "uses en/merge-ort-2", as you noted, but that was already noted separately. Am I missing something?

Previous: Junio C HamanoNext: Junio C Hamano
Message 8 of 14 in “What's cooking in git.git (Dec 2020, #03; Fri, 18)”
  1. Junio C HamanoDec 19, 2020
  2. Eric SunshineDec 19, 2020
  3. Junio C HamanoDec 19, 2020
  4. Felipe ContrerasDec 19, 2020
  5. Junio C HamanoDec 19, 2020
  6. Elijah NewrenDec 20, 2020
  7. Junio C HamanoDec 20, 2020
  8. Elijah NewrenDec 21, 2020
  9. Junio C HamanoDec 21, 2020
  10. Han-Wen NienhuysDec 21, 2020
  11. Junio C HamanoDec 21, 2020
  12. SQUASH??? allow t0031 to run with any default branch nameJunio C Hamano, Dec 21, 2020
  13. Felipe ContrerasDec 21, 2020
  14. Han-Wen NienhuysDec 22, 2020

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.