From: Junio C Hamano <gitster@pobox.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: "Theodore Ts'o" <tytso@mit.edu>, James Morris <jmorris@namei.org>,
Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: linux-next: unneeded merge in the security tree
Date: Tue, 12 Mar 2013 13:02:19 -0700 [thread overview]
Message-ID: <7vobeo75f8.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <7vsj40760d.fsf@alter.siamese.dyndns.org> (Junio C. Hamano's message of "Tue, 12 Mar 2013 12:49:38 -0700")
Junio C Hamano <gitster@pobox.com> writes:
> Then under the "--no-ff activates the magic" rule:
>
> git merge v3.9-rc2
>
> will fast-forward, but this
>
> git merge --no-ff v3.9-rc2
>
> creates a real merge with the "mergetag" signature block. The one
> that caused trouble in the "security tree", i.e.
>
> git pull linus v3.9-rc2
>
> or its equivalent
>
> git fetch linus v3.9-rc2
> git merge FETCH_HEAD
>
> would still fast-forward under this rule. The maintainer needs to
> do
>
> git pull --no-ff git://git.kernel.org/... for-linus
>
> if the pull could fast-forward under this rule, though.
Scratch the last sentence. It should have been
"whether the pull fast-forwards or not". You'd always need to.
next prev parent reply other threads:[~2013-03-12 20:02 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-11 23:09 linux-next: unneeded merge in the security tree Stephen Rothwell
2013-03-12 4:10 ` James Morris
2013-03-12 4:16 ` Theodore Ts'o
2013-03-12 5:18 ` Stephen Rothwell
2013-03-12 13:25 ` Theodore Ts'o
2013-03-12 20:43 ` Junio C Hamano
2013-03-12 9:29 ` Sedat Dilek
2013-03-12 17:13 ` Linus Torvalds
2013-03-12 17:51 ` Geert Uytterhoeven
2013-03-12 19:49 ` Junio C Hamano
2013-03-12 20:02 ` Junio C Hamano [this message]
2013-03-12 21:20 ` Theodore Ts'o
2013-03-12 21:28 ` Linus Torvalds
2013-03-12 21:47 ` Junio C Hamano
2013-03-12 21:54 ` Linus Torvalds
2013-03-12 22:00 ` Junio C Hamano
2013-03-13 2:30 ` Theodore Ts'o
2013-03-13 3:17 ` Junio C Hamano
2013-03-12 21:30 ` Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vobeo75f8.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jmorris@namei.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=torvalds@linux-foundation.org \
--cc=tytso@mit.edu \
/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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox