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

[Stephen Rothwell]

On Tue, 27 Nov 2012 15:30:31 -0800 Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> wrote:
>
> On Tue, Nov 27, 2012 at 3:28 PM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> >
> > 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?
> 
> No. That just hides the real problem - back-merges of random points in history.
> 
> Don't do them, people. EVER.

I was also thinking about the case where a developer does work based on
the maintainer's published tree and then the maintainer pulls that work
sometime later (when his published tree has not been updated in the mean
time).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature