[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-750-g494e471

[simo]

On Thu, 2009-03-26 at 18:22 +0100, Volker Lendecke wrote:
> Hi, Jelmer!
> 
> On Thu, Mar 26, 2009 at 11:19:52AM -0500, Jelmer Vernooij wrote:
> > commit 494e471d747c1e858481fad16cb33574d3e7f985
> > Author: Jelmer Vernooij <jelmer at samba.org>
> > Date:   Thu Mar 26 16:28:45 2009 +0100
> > 
> >     configure: Use m4 defines for minimum library versions rather than shell
> >     variables, so the values rather than the variable names show up in
> >     configure output.
> > 
> > commit 50189e81d04edd313f707fc3bb7f18e46389e9e6
> > Merge: ef10b40338a98f1700b1a8d24a445715d846a5a6 ea907a7144beb29cb5c823851a98ceac8166994b
> > Author: Jelmer Vernooij <jelmer at samba.org>
> > Date:   Thu Mar 26 15:31:35 2009 +0100
> > 
> >     Merge branch 'copyright' of /home/jelmer/samba4
> 
> I just tried to review these changes with "git whatchanged",
> and your s3-relevant changes were buried somewhere deep in
> the list.
> 
> When you check in something that affects Samba 3, please use
> "git rebase" instead of "git merge".

+1, in this push there where 5 real commits and 6 merge commits ... it's
not only ugly as hell, it makes it really challenging to understand
what's going on.

Doesn't take much to have a "push branch" where you commit rebased
patches on top of the current master and avoid useless merges.

Simo.

-- 
Simo Sorce
Samba Team GPL Compliance Officer <simo at samba.org>
Principal Software Engineer at Red Hat, Inc. <simo at redhat.com>