Junio C Hamano <gits...@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
> 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.
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html