[Numpy-discussion] Yet more merges in maintenance/1.5.x
Charles R Harris
Sat Nov 20 15:22:58 CST 2010
On Sat, Nov 20, 2010 at 2:05 PM, Pauli Virtanen <email@example.com> wrote:
> On Sat, 20 Nov 2010 20:57:07 +0000, Pauli Virtanen wrote:
> > There are more unnecessary merge commits in the git history.
> I did a forced push to clear those up.
It was a pull from upstream to update that did it, when I noticed I decided
not to do a forced push cleanup because, well, it's risky for a public
repository. But I'm not sure why the pull didn't just fast forward, I
suspect something is off in my local branch. I'll just delete it and co
again from upstream.
-------------- next part --------------
An HTML attachment was scrubbed...
More information about the NumPy-Discussion