lkml.org 
[lkml]   [2013]   [Mar]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: linux-next: unneeded merge in the security tree
Date
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.


\
 
 \ /
  Last update: 2013-03-12 21:43    [W:0.080 / U:0.852 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site