From: Junio C Hamano Date: Thu, 24 Feb 2011 00:43:58 GMT Subject: Re: What's cooking in git.git (Feb 2011, #05; Wed, 23) Message-ID: <7voc6245yp.fsf@alter.siamese.dyndns.org> In-Reply-To: <201102240052.36379.johan@herland.net> Johan Herland writes: > On Thursday 24 February 2011, Junio C Hamano wrote: >> Here are the topics that have been cooking. Commits prefixed with '-' >> are only in 'pu' while commits prefixed with '+' are in 'next'. >> >> [...] >> * jh/maint-do-not-track-non-branches (2011-02-17) 1 commit >> - branch/checkout --track: Ensure that upstream branch is indeed a >> branch >> >> This supersedes "do not track HEAD" from Thomas. > > What do you mean by "supersedes"? It builds on top of Thomas' patch (v2 was > rebased on top it), but it does not _replace_ Thomas' patch. I judge that the earlier one to special case only "HEAD" a failed attempt to the wider problem; what was posted to the list might have been relative to it, but what is queued reverts the effect of the previous patch and is relative to the mainline.