# Re: linux-next: unneeded merge in the security tree

- From: Junio C Hamano \<hidden\>
- Date: 2013-03-12 20:02:24 
- List: git
- Page: https://ratatoskr.run/git/2013/03/4015609
- Thread: https://ratatoskr.run/linux-next/2013/03/4015609/t.md

```text
Junio C Hamano [ref] 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.
```