[U-Boot-Users] [GIT PULL] Please pull net tree

[Martin Krause]

u-boot-users-bounces at lists.sourceforge.net wrote on :
> Wolfgang,
> 
> Please pull the net tree.  I believe it's in sync with the main line.
> 
> P.S. is there a way to get rid of the merge log entries from when I
> sync with the main line, or do we want them there?

I see no advantage in the presence of this log entries. AFAIK the
only way to avoid this is to do a git rebase instead of a git
merge/pull (as described by Jerry recently 
http://article.gmane.org/gmane.comp.boot-loaders.u-boot/32962/match=mpc8641hpcn+board)
The disadvantage is a messed up git history for everyone who
already pulled from this branch. On a seperated "merge" branch 
- as proposed by Jerry a few times now ;-) - this wouldn't hurt much,
but on the master branch this is maybe suboptimal.

Best Regards,
Marti Krause