lkml.org 
[lkml]   [2013]   [Mar]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: unneeded merge in the security tree
On Tue, 12 Mar 2013, Stephen Rothwell wrote:

> Hi all,
>
> [James, I am not picking on you, just using your tree to illustrate a
> point.]
>
> The top commit in the security tree today is a merge of v3.9-rc2. This
> is a completely unnecessary merge as the tree before the merge was a
> subset of v3.9-rc1 and so if the merge had been done using anything but
> the tag, it would have just been a fast forward. I know that this is now
> deliberate behaviour on git's behalf, but isn't there some way we can
> make this easier on maintainers who are just really just trying to pick a
> new starting point for their trees after a release? (at least I assume
> that is what James was trying to do)

Yes, and I was merging to a tag as required by Linus.


--
James Morris
<jmorris@namei.org>


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