[SCM] Samba Shared Repository - branch master updated

[simo]

On Wed, 2010-04-14 at 23:39 +1000, tridge at samba.org wrote:
> > Author: Andrew Tridgell <tridge at samba.org>
>  > Date:   Wed Apr 14 23:38:05 2010 +1000
>  > 
>  >     Merge branch 'master' of ssh://git.samba.org/data/git/samba
> 
> sorry, I forgot a --rebase on a git pull

Would it make sense to have a hook that prevents pushes of merge
commits ?
Or do we have legitimate uses for merges in the main branch ?

Simo.

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