From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Isaac Shabtay <isaac@shabtay.com>, git@vger.kernel.org
Subject: Re: Bug report: git clone with dest
Date: Fri, 5 Jan 2018 15:52:27 -0500 [thread overview]
Message-ID: <20180105205227.GA6958@sigill.intra.peff.net> (raw)
In-Reply-To: <xmqqmv1savcg.fsf@gitster.mtv.corp.google.com>
On Fri, Jan 05, 2018 at 12:45:03PM -0800, Junio C Hamano wrote:
> Jeff King <peff@peff.net> writes:
>
> > Out of curiosity, did this change at some point? I thought the process
> > used to be to merge to maint, and then pick up topics in master by
> > merging maint to master.
>
> If you look at "Sync with maint" merges made to 'master', you'd
> notice that most of them are only updating Documentation/RelNotes/*
> and otherwise no-effect merges, simply because when such an up-merge
> is made, everything in 'maint' is already in 'master' because topics
> are merged to the latter first. Security fixes that go through
> embargoes are excempt for obvious reasons ;-)
OK, that makes sense. Pretty sure I did it wrong when I was interim
maintainer back in the day, then. :)
-Peff
next prev parent reply other threads:[~2018-01-05 20:52 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-03 20:59 Bug report: git clone with dest Isaac Shabtay
2018-01-03 22:28 ` Jeff King
2018-01-03 22:44 ` Isaac Shabtay
2018-01-04 23:20 ` Johannes Schindelin
2018-01-05 5:11 ` Isaac Shabtay
2018-01-05 10:33 ` Johannes Schindelin
2018-01-05 18:55 ` Isaac Shabtay
2018-01-05 20:22 ` Johannes Schindelin
2018-01-05 20:38 ` Junio C Hamano
2018-01-05 20:44 ` Jeff King
2018-01-05 21:39 ` Johannes Schindelin
[not found] ` <CAK2k7nQcY+QQBfda6CHM8tFo3i4XX2tXxHKv73t6SJ4rRvWo1w@mail.gmail.com>
2018-01-04 4:01 ` Jeff King
2018-01-05 19:53 ` Junio C Hamano
2018-01-05 19:57 ` Jeff King
2018-01-05 20:45 ` Junio C Hamano
2018-01-05 20:52 ` Jeff King [this message]
2018-01-05 22:37 ` Junio C Hamano
2018-01-06 4:43 ` Jeff King
2018-01-05 21:06 ` Johannes Schindelin
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=20180105205227.GA6958@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=isaac@shabtay.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).