Re: [matplotlib-devel] I screwed up matplotlib/master on github

2011-03-28 Thread Matthew Brett
Yo, On Mon, Mar 28, 2011 at 8:17 AM, Michael Droettboom wrote: > There's also this git command I just discovered.  It seems to solve all of > these issues, and the documentation is written in the same crystal-clear > style of the other git manpages: > > http://wingolog.org/archives/2011/03/28/g

Re: [matplotlib-devel] I screwed up matplotlib/master on github

2011-03-28 Thread Michael Droettboom
Paul Ivanov [pivanov...@gmail.com] Sent: Thursday, March 24, 2011 8:20 PM To: matplotlib-devel@lists.sourceforge.net Subject: Re: [matplotlib-devel] I screwed up matplotlib/master on github Matthew Brett, on 2011-03-24 16:37, wrote: > Welcome to the wonderful world of git and DVCS! Thanks, I wish

Re: [matplotlib-devel] I screwed up matplotlib/master on github

2011-03-24 Thread Paul Ivanov
Matthew Brett, on 2011-03-24 16:37, wrote: > Welcome to the wonderful world of git and DVCS! Thanks, I wish I could claim that I only started using git recently, but I've just sort of been uncomfortably trying my best to not cause too much trouble for the past year and a half... > > I think you

Re: [matplotlib-devel] I screwed up matplotlib/master on github

2011-03-24 Thread Matthew Brett
Hi Paul, On Thu, Mar 24, 2011 at 2:55 AM, Paul Ivanov wrote: > Paul Ivanov, on 2011-03-24 01:30,  wrote: >> I offer my sincerest apologies, I royally screwed up and thought >> that I was pushing out to one of my own branches and somehow >> ended up pushing a 2 day old copy of master out to >> mat

Re: [matplotlib-devel] I screwed up matplotlib/master on github

2011-03-24 Thread Darren Dale
On Thu, Mar 24, 2011 at 7:28 AM, Jouni K. Seppänen wrote: > Paul Ivanov writes: > >> I can't figure out a way to pull it from there, but I think Eric >> was the last to commit to trunk before I (destructively) pushed >> my stale copy. Eric's last commit hash was: >> 8506c33c811e970c6aa73a446d3ed2

Re: [matplotlib-devel] I screwed up matplotlib/master on github

2011-03-24 Thread Jouni K . Seppänen
Paul Ivanov writes: > I can't figure out a way to pull it from there, but I think Eric > was the last to commit to trunk before I (destructively) pushed > my stale copy. Eric's last commit hash was: > 8506c33c811e970c6aa73a446d3ed223ac48f989 The git and ssh transports will only fetch branches an

Re: [matplotlib-devel] I screwed up matplotlib/master on github

2011-03-24 Thread John Hunter
On Mar 24, 2011, at 4:59 AM, John Hunter wrote: > > With git you can clean up bad commits by simply changing the reference to > master, or reorder and edit commits with rebase. Darren, can you take a look > and see what should be done? It may be more complicated when you have > multiple fork

Re: [matplotlib-devel] I screwed up matplotlib/master on github

2011-03-24 Thread John Hunter
On Mar 24, 2011, at 3:30 AM, Paul Ivanov wrote: > I offer my sincerest apologies, I royally screwed up and thought > that I was pushing out to one of my own branches and somehow > ended up pushing a 2 day old copy of master out to > matplotlib/master with 'git push -f'. Assuming Mike's work from

Re: [matplotlib-devel] I screwed up matplotlib/master on github

2011-03-24 Thread Paul Ivanov
Paul Ivanov, on 2011-03-24 01:30, wrote: > I offer my sincerest apologies, I royally screwed up and thought > that I was pushing out to one of my own branches and somehow > ended up pushing a 2 day old copy of master out to > matplotlib/master with 'git push -f'. Assuming Mike's work from > today

[matplotlib-devel] I screwed up matplotlib/master on github

2011-03-24 Thread Paul Ivanov
I offer my sincerest apologies, I royally screwed up and thought that I was pushing out to one of my own branches and somehow ended up pushing a 2 day old copy of master out to matplotlib/master with 'git push -f'. Assuming Mike's work from today is also in his own master branch, I think the damage