[rtems commit] Merge branch 'master' of ssh://dispatch.rtems.org/data/git/ rtems

[Chris Johns]

On 25/01/2016 07:34, Gedare Bloom wrote:
> see sebastians previous email about setting the default behavior for pull.
>
> when you git-pull, it either says 'fast forward' or 'merge'. ffwd is
> what you want. merge is what causes the merge-commit msg. you should
> always be doing 'git pull --rebase' for rtems
>

Joel, I think git log should contain the message so it might pay to 
check what you have before you push.

Chris