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

On Mon, Feb 20, 2012 at 2:11 AM, Keshav Kini

wrote:
> Hi William,
>
> You should base these commits on the branch `master` and not the branch `github-master`. The latter contains an extra file (README.rst) which you won't want in your eventual trac patch. To fix this now, do:
>
> {{{
> $ git checkout lfun
> $ git rebase upstream/github-master --onto upstream/master
> }}}
>
> (The `--onto` stuff might be a bit confusing. Normally you shouldn't need to do rebasing, though.)

So the above doesn't work. However, if I use "git diff" as mhansen
suggested I get patches that don't
include the README.txt, so no worries.

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

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