williamstein/sagelib — comment on commit f4104efd87cb421923f884f8ea5c571fa52d583b
File:  line 0
By williamstein:

On Sat, Feb 25, 2012 at 10:44 AM, Keshav Kini

wrote:
> Huh. Maybe. I'm using 1.7.9.2. I assume:
>
> * that you have local branches called "github-master" and "master", and that they correspond to whatever they were on sagemath/sagelib when you forked it (or, apparently equivalently, to what they currently are on williamstein/sagelib). Do you have the following output, probably plus a few more lines?
>
> ```
> $ git branch -vv
> github-master ecaff3a More corrections to README.rst
> lfun 739bcf8 padic_lseries -- working on doctesting padic_elliptic_lseries_fast.pyx
> master f583b1b 5.0.beta4

Nope. That must be the problem. I have

deep:sage wstein$ git branch -vv
github-master ecaff3a [origin/github-master] More corrections to README.rst
* lfun 739bcf8 padic_lseries -- working on doctesting
padic_elliptic_lseries_fast.pyx

> ```
>
> * that git isn't choking on the option coming after the argument (because it reads more logically the way I wrote it). Does the following work instead? If so, maybe git learned how to see options after arguments sometime between 1.7.4.4. and 1.7.9.2.
>
> ```
> $ git checkout lfun
> $ git rebase --onto master github-master

deep:sage wstein$ git rebase --onto master github-master
fatal: Needed a single revision

> ```
>
> ---
> Reply to this email directly or view it on GitHub:
> https://github.com/williamstein/sagelib/commit/f4104efd87cb421923f884f8ea5c571fa52d583b#commitcomment-1011154

--
William Stein
Professor of Mathematics
University of Washington
http://wstein.org