What kind of commit is this ? :-)

I see that some committers tend to push trees where there are lot of
merges, this is a bit ugly.

I'd like to advice people to have their own development branch separate
from the push branch (use git branch -b to create a different one), and
use git cherrypick to pick patches from their own branch and apply them
to the push branch *after* a git pull and just before a git push. This
way it will much less common to have merge commits cluttering the main
tree.

Simo.

On Sat, 2008-03-29 at 01:19 -0500, Andrew Bartlett wrote:
> The branch, v4-0-test has been updated
> via ee6539e4cab8882faafff17f458df91cba352f8e (commit)
> via 9b4449b46c0404b3c694ac9c592be63185c366b7 (commit)
> from e906ae041a2b589ffceff97b74f7c4b01386382a (commit)
>
> http://gitweb.samba.org/?p=samba.git...og;h=v4-0-test
>
>
> - Log -----------------------------------------------------------------
> commit ee6539e4cab8882faafff17f458df91cba352f8e
> Merge: e906ae041a2b589ffceff97b74f7c4b01386382a 9b4449b46c0404b3c694ac9c592be63185c366b7
> Author: Andrew Bartlett
> Date: Sat Mar 29 17:19:20 2008 +1100
>
> Merge branch 'v4-0-local' of git://git.id10ts.net/samba into 4-0-local
>
> commit 9b4449b46c0404b3c694ac9c592be63185c366b7
> Merge: ebe5e8399422eb7e2ff4deb546338823e2718907 326ae6ce9c8a6f5800d5ecb4a2bfdfc32336797d
> Author: Andrew Kroeger
> Date: Fri Mar 28 05:43:52 2008 -0500
>
> Merge branch 'v4-0-test' of git://git.samba.org/samba into v4-0-local
>
> -----------------------------------------------------------------------
>
> Summary of changes:
>
>
> Changeset truncated at 500 lines:
>
>
>

--
Simo Sorce
Samba Team GPL Compliance Officer
Senior Software Engineer at Red Hat Inc.