From: Junio C Hamano <email@example.com> To: Derrick Stolee <firstname.lastname@example.org> Cc: email@example.com, Jonathan Tan <firstname.lastname@example.org> Subject: Re: What's cooking in git.git (Aug 2020, #04; Tue, 18) Date: Wed, 19 Aug 2020 10:09:08 -0700 [thread overview] Message-ID: <email@example.com> (raw) In-Reply-To: <firstname.lastname@example.org> (Derrick Stolee's message of "Wed, 19 Aug 2020 10:56:13 -0400") Derrick Stolee <email@example.com> writes: > On 8/18/2020 6:50 PM, Junio C Hamano wrote: >> * ds/maintenance-part-1 (2020-08-18) 11 commits >> - maintenance: add trace2 regions for task execution >> - maintenance: add auto condition for commit-graph task >> - maintenance: use pointers to check --auto >> - maintenance: create maintenance.<task>.enabled config >> - maintenance: take a lock on the objects directory >> - maintenance: add --task option >> - maintenance: add commit-graph task >> - maintenance: initialize task array >> - maintenance: replace run_auto_gc() >> - maintenance: add --quiet option >> - maintenance: create basic maintenance runner >> (this branch is used by ds/maintenance-part-2; uses jc/no-update-fetch-head; is tangled with jt/lazy-fetch.) > > Is this "is tangled with jt/lazy-fetch" related to the > fact that jc/no-update-fetch-head was part of my branches, > or are we colliding in other interesting ways? The phrasing is unfortunate but what it wants to convey is that, when the commits that are in this topic but not in 'master', and the commits that are in the other topic but not in 'master', are compared, there is overlap. If one is a subset of the other, 'used by' and 'uses' are the words used to describe these two topics. I just picked to use 'is tangled with' when both sides have unique commits that are not in 'master'. IOW "shares commits with X that are not in 'master'" is what I wanted to say, but has been too lazy to find a better word X-<.
prev parent reply other threads:[~2020-08-19 17:09 UTC|newest] Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-08-18 22:50 Junio C Hamano 2020-08-19 14:56 ` Derrick Stolee 2020-08-19 17:09 ` Junio C Hamano [this message]
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 \ --firstname.lastname@example.org \ --email@example.com \ --firstname.lastname@example.org \ --email@example.com \ --firstname.lastname@example.org \ --subject='Re: What'\''s cooking in git.git (Aug 2020, #04; Tue, 18)' \ /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
Code repositories for project(s) associated with this 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).