From: Elijah Newren <newren@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: What's cooking in git.git (Dec 2020, #03; Fri, 18)
Date: Mon, 21 Dec 2020 09:25:15 -0800 [thread overview]
Message-ID: <CABPp-BErnY+zfmp-LWTe0EUB5QKKcLCP=4t9VxwvA_+DaBvDuw@mail.gmail.com> (raw)
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:
>
> 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?
next prev parent reply other threads:[~2020-12-21 18:27 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-19 5:34 What's cooking in git.git (Dec 2020, #03; Fri, 18) Junio C Hamano
2020-12-19 6:44 ` Eric Sunshine
2020-12-19 17:13 ` Junio C Hamano
2020-12-19 14:10 ` Felipe Contreras
2020-12-19 17:09 ` Junio C Hamano
2020-12-20 2:19 ` Elijah Newren
2020-12-20 7:32 ` Junio C Hamano
2020-12-21 17:25 ` Elijah Newren [this message]
2020-12-21 17:50 ` Junio C Hamano
2020-12-21 12:40 ` Han-Wen Nienhuys
2020-12-21 18:01 ` Junio C Hamano
2020-12-21 19:55 ` [PATCH] SQUASH??? allow t0031 to run with any default branch name Junio C Hamano
2020-12-21 20:19 ` Felipe Contreras
2020-12-22 10:22 ` Han-Wen Nienhuys
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CABPp-BErnY+zfmp-LWTe0EUB5QKKcLCP=4t9VxwvA_+DaBvDuw@mail.gmail.com' \
--to=newren@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).