Re: [git-pull -tip] x86: include inverse Xmas tree patches

[Jaswinder Singh Rajput <jaswinder@kernel.org>]

On Sat, 2009-03-28 at 15:25 -0700, H. Peter Anvin wrote:
> Sam Ravnborg wrote:
> > 
> > Ordering include based on length of line minimize the
> > risk of merge conflicts.
> > If people just add new includes in the bottom of the list you
> > are certain that a merge conflit happens.
> > 
> > This scheme is starting to be used in several places with the
> > primary advocates being David Miller and Ingo.
> > 
> > It is getting used both for includes _and_ for local variables.
> > 
> 
> Personally I'd prefer alphabetic order, sorting based on length isn't a
> complete ordering.  Nearly all editors can sort alphabetically at the
> push of a key.
> 

This sorting is based on Length + alphabetic.

--
JSR