Re: [Numpy-discussion] Commit rights on github

2010-10-12 Thread Robert Cimrman
Hi Fernando, On Tue, 12 Oct 2010, Fernando Perez wrote: 2010/10/12 Stéfan van der Walt : - Then: merge into master, getting a fast-forward merge if possible - Push back to github When I have large changes that consist of several commits on a single topic, I normally explicitly ask for a non-f

Re: [Numpy-discussion] Commit rights on github

2010-10-12 Thread Pauli Virtanen
Mon, 11 Oct 2010 20:12:47 -0600, Charles R Harris wrote: > I can't quite figure out what commit > a14dd542532d383610c1 > did or where it applied. Any hints? The github output here is confusing, as it chooses to diff th

Re: [Numpy-discussion] Commit rights on github

2010-10-12 Thread Fernando Perez
2010/10/12 Stéfan van der Walt : > - Then: merge into master, getting a fast-forward merge if possible > - Push back to github > > When I have large changes that consist of several commits on a single > topic, I normally explicitly ask for a non-fast-forward merge, so that > the history is not cont

Re: [Numpy-discussion] Commit rights on github

2010-10-12 Thread David Cournapeau
On Tue, Oct 12, 2010 at 4:57 PM, Matthew Brett wrote: > Hi, > >>> Now might be a good time to discuss how we'd like the history to look >>> in a year from now.  If we follow the above approach, I guess we may >>> end up with one merge message for each small little bug-fix? (Unless >>> --rebase is

Re: [Numpy-discussion] Commit rights on github

2010-10-12 Thread Stéfan van der Walt
On Tue, Oct 12, 2010 at 9:47 AM, David Cournapeau wrote: >> Now might be a good time to discuss how we'd like the history to look >> in a year from now.  If we follow the above approach, I guess we may >> end up with one merge message for each small little bug-fix? (Unless >> --rebase is used)  Ho

Re: [Numpy-discussion] Commit rights on github

2010-10-12 Thread Matthew Brett
Hi, >> Now might be a good time to discuss how we'd like the history to look >> in a year from now.  If we follow the above approach, I guess we may >> end up with one merge message for each small little bug-fix? (Unless >> --rebase is used)  How do we ensure that "fast-forward" merges occur >> wh

Re: [Numpy-discussion] Commit rights on github

2010-10-12 Thread David Cournapeau
2010/10/12 Stéfan van der Walt : > On Tue, Oct 12, 2010 at 6:37 AM, David wrote: >> In that case, a way to avoid this mistake is to do the following: >> >>   * make changes on your own git repository clone >>   * once you have a set of changesets of commits, first update your >> branch from upstre

Re: [Numpy-discussion] Commit rights on github

2010-10-12 Thread Stéfan van der Walt
On Tue, Oct 12, 2010 at 6:37 AM, David wrote: > In that case, a way to avoid this mistake is to do the following: > >   * make changes on your own git repository clone >   * once you have a set of changesets of commits, first update your > branch from upstream (a bit like svn up) with git pull: at

Re: [Numpy-discussion] Commit rights on github

2010-10-11 Thread David
On 10/12/2010 11:12 AM, Charles R Harris wrote: > > > On Mon, Oct 11, 2010 at 7:31 PM, David > wrote: > > On 10/12/2010 08:48 AM, Charles R Harris wrote: > > > > > > On Mon, Oct 11, 2010 at 5:09 PM, Pierre GM >

Re: [Numpy-discussion] Commit rights on github

2010-10-11 Thread Charles R Harris
On Mon, Oct 11, 2010 at 7:31 PM, David wrote: > On 10/12/2010 08:48 AM, Charles R Harris wrote: > > > > > > On Mon, Oct 11, 2010 at 5:09 PM, Pierre GM > > wrote: > > > > > > On Oct 12, 2010, at 1:06 AM, Pauli Virtanen wrote: > > > > > Mon, 11 Oct 2010 23:30:

Re: [Numpy-discussion] Commit rights on github

2010-10-11 Thread David
On 10/12/2010 08:48 AM, Charles R Harris wrote: > > > On Mon, Oct 11, 2010 at 5:09 PM, Pierre GM > wrote: > > > On Oct 12, 2010, at 1:06 AM, Pauli Virtanen wrote: > > > Mon, 11 Oct 2010 23:30:31 +0200, Pierre GM wrote: > >> Would any of you mind giving me

Re: [Numpy-discussion] Commit rights on github

2010-10-11 Thread Charles R Harris
On Mon, Oct 11, 2010 at 5:09 PM, Pierre GM wrote: > > On Oct 12, 2010, at 1:06 AM, Pauli Virtanen wrote: > > > Mon, 11 Oct 2010 23:30:31 +0200, Pierre GM wrote: > >> Would any of you mind giving me commit rights on github? My handle is > >> pierregm. Thanks a million in advance. > > > > Granted.

Re: [Numpy-discussion] Commit rights on github

2010-10-11 Thread Pierre GM
On Oct 12, 2010, at 1:06 AM, Pauli Virtanen wrote: > Mon, 11 Oct 2010 23:30:31 +0200, Pierre GM wrote: >> Would any of you mind giving me commit rights on github? My handle is >> pierregm. Thanks a million in advance. > > Granted. Got it, thanks again! P. ___

Re: [Numpy-discussion] Commit rights on github

2010-10-11 Thread Pauli Virtanen
Mon, 11 Oct 2010 23:30:31 +0200, Pierre GM wrote: > Would any of you mind giving me commit rights on github? My handle is > pierregm. Thanks a million in advance. Granted. Cheers, Pauli ___ NumPy-Discussion mailing list NumPy-Discussion@scipy.org http:

[Numpy-discussion] Commit rights on github

2010-10-11 Thread Pierre GM
All, Would any of you mind giving me commit rights on github? My handle is pierregm. Thanks a million in advance. P. ___ NumPy-Discussion mailing list NumPy-Discussion@scipy.org http://mail.scipy.org/mailman/listinfo/numpy-discussion