[infinispan-dev] Merge commits in Git

[David M. Lloyd]

On 11/11/2010 01:27 PM, Galder Zamarreño wrote:
> The merge messages appearing in https://github.com/infinispan/infinispan/commits/master are a bit noisy, aren't they?

To avoid that, people working in branches should use "git rebase" or 
"git pull --rebase" to bring in upstream changes, NOT "git merge" or 
"git pull" (sans --rebase).

Not only are merge messages noisy but they can make it very hard to 
figure out the history of a change.
-- 
- DML