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

2013-05-18 Thread Daniel Narvaez
https://github.com/sugarlabs/sugar-docs/pull/12 On 13 May 2013 00:08, Daniel Narvaez wrote: > There seem to be agreement on this. I'd say the change should be effective > as soon as someone patches sugar-docs :) > > > On Friday, 10 May 2013, Simon Schampijer wrote: > >> Hi, >> >> with the merge

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

2013-05-12 Thread Daniel Narvaez
There seem to be agreement on this. I'd say the change should be effective as soon as someone patches sugar-docs :) On Friday, 10 May 2013, Simon Schampijer wrote: > 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

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

2013-05-10 Thread Manuel Quiñones
2013/5/10 Daniel Narvaez : > Can we just link developer.sugarlabs.org from the wiki? It would be nice to > keep all the dev information in one place. +1 > > > On 10 May 2013 14:03, Walter Bender wrote: >> >> Be nice to put this info somewhere prominent in the wiki too... on the top >> of the deve

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

2013-05-10 Thread Daniel Narvaez
Can we just link developer.sugarlabs.org from the wiki? It would be nice to keep all the dev information in one place. On 10 May 2013 14:03, Walter Bender wrote: > Be nice to put this info somewhere prominent in the wiki too... on the top > of the development team page perhaps? > > -walter > >

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

2013-05-10 Thread Walter Bender
Be nice to put this info somewhere prominent in the wiki too... on the top of the development team page perhaps? -walter On Fri, May 10, 2013 at 7:59 AM, Manuel Quiñones wrote: > 2013/5/10 Simon Schampijer : > > Hi, > > > > with the merges from Github we do get a non ideal git history. The mer

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

2013-05-10 Thread Manuel Quiñones
2013/5/10 Simon Schampijer : > 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

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

2013-05-10 Thread Simon Schampijer
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