[Sugar-devel] Git history with merges from git hub

Manuel Quiñones manuq at laptop.org
Fri May 10 07:59:09 EDT 2013


2013/5/10 Simon Schampijer <simon at schampijer.de>:
> Hi,
>
> with the merges from Github we do get a non ideal git history. The merge
> pull requests do only add value as they show who did authorize the merge.
> But they can be in another order to the actual commit.
>
> One way to handle this would be to do a git rebase before pushing and avoid
> the merge messages.
>
> Thoughts?

+1 to start doing git rebase.  We can then modify this doc:

https://github.com/sugarlabs/sugar/blob/master/README.md

We could move the "Contributing" section to sugar-docs too.

--
.. manuq ..


More information about the Sugar-devel mailing list