Re: linux-next: unusual update of the security tree

[Stephen Rothwell]

Hi James,

On Wed, 28 Nov 2012 10:16:35 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> The security tree
> (git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next)
> looks a bit strange today ... It appears to have been created by Casey
> Schaufler (cc'd) and contains some quite old commits and back merges of
> your tree.  I *guess* you have merged in Casey's tree after he merged in
> your tree from yesterday.

If that is what happened, it may be worth always using the --no-ff flag
to git merge/pull to make sure that the top commit on your tree always
has you as the committer (and maybe SOB).

Linus, does that make sense in general for maintainers?

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature