On Mon, Jul 7, 2014 at 2:02 AM, Julian Taylor <jtaylor.deb...@googlemail.com > wrote:
> On 07.07.2014 07:53, Charles R Harris wrote: > > Just so. The fixes for 1.9.0b1 are now in that branch ready for the next > > beta. > > > > how did you do that without a merge commit? > git branch tmp maintenance/1.9.x git co tmp git branch -f maintenance/1.9.x d244ec7 git rebase -p --onto tmp 10098da maintenance/1.9.x > however you did it you have git has lost ancestry which is not so nice > for backporting. > Same changesets, I believe. If '-p' is omitted the merges are omitted. > If there are no objections I'd like to rewind the maintenance branch > back to beta1 and merge master in properly. > I thought this somewhat cleaner than a merge :0 Chuck
_______________________________________________ NumPy-Discussion mailing list NumPy-Discussion@scipy.org http://mail.scipy.org/mailman/listinfo/numpy-discussion
