[dev] [commits] Horde-Hatchery branch, master, updated. 46a4ceaace402c1b0605849384f9b2b789760ffe

[Michael M Slusarz]

Quoting Chuck Hagenbuch <chuck at horde.org>:

> The branch, master has been updated
>       via  46a4ceaace402c1b0605849384f9b2b789760ffe (commit)
>       via  2d1a0ba1a57cf4c2e42b81ad51f9ba380b3264e6 (commit)
>      from  7de276204b5859d9ce8a62dfaee8a5cbe30f069c (commit)

[snip]

> - Log -----------------------------------------------------------------
> commit 46a4ceaace402c1b0605849384f9b2b789760ffe
> Merge: 2d1a0ba1a57cf4c2e42b81ad51f9ba380b3264e6  
> 7de276204b5859d9ce8a62dfaee8a5cbe30f069c
> Author: Chuck Hagenbuch <chuck at horde.org>
> Date:   Sat Nov 15 12:24:38 2008 -0500
>
>    Merge branch 'master' of chuck at dev.horde.org:/horde/git/horde-hatchery

These log entries are why devs should probably be using 'git pull  
--rebase' to pull the changes instead of just 'git pull'.  I think it  
is entirely unnecessary (and a bit annoying) to have these kind of  
merge commits polluting the commit e-mails and history.

See, e.g.:
http://jbowes.dangerouslyinc.com/2007/01/26/git-rebase-keeping-your-branches-current/
http://www.kernel.org/pub/software/scm/git/docs/user-manual.html#using-git-rebase

michael

-- 
___________________________________
Michael Slusarz [slusarz at horde.org]