On Wed, Nov 2, 2011 at 10:14 AM, <[email protected]> wrote: >> On Wed, Nov 2, 2011 at 9:36 AM, <[email protected]> wrote: >> What is the output of "git status"? > > "Two files added", namely generate.py and test/ntheory_test.py (I think, > I'm quoting from memory here). > These are copies of the modified files, which are not reported as modified. > > I did do a commit, then noticed I had forgot to branch, backed out of the > commit, fixed things up so that the changed files are now HEAD but based > on the "origin". > I guess I made an error somewhere and instructed git to treat my current > modifications as the repository contents, or whatever. > > Since it's just two files, it will try this: > - save the changed files somewhere > - set up a local repository as a download of my github fork of sympy > - cp the changed files to the right place again > - upload to github > - send the pull request
OK. One thing that you should do is clone from the official repo, not your fork. So you will want to do something like git clone git://github.com/sympy/sympy.git cd sympy git remote add github your_ssh_url Then you can "git pull" to get updates from the official repo, and "git push github branch_name" to push your changes up to your GitHub account. > >> By the way, did anyone ever point you to >> https://github.com/sympy/sympy/wiki/development-workflow? > > Yes, it was one of the first pages I read once I decided to give sympy a > closer look. > To me, it's still containing new and interesting stuff every time I > re-read it :-) > > BTW that page is really good. It repeats all the steps necessary and shows > how the results of each step should look like - commended :-) > Maybe the section on git tuning should mention that some (most? all?) > Linux distros come with a pre-tuned git package. At least on current > Ubuntu, colors and tab completion are already in (not sure about aliases, > I don't want or use them). It might be a good idea to show some test > commands that allow people to identify what, if any, tuning they already > have. > But that's all really just a minor point. > > Regards, > Jo I updated this section with your suggestions. Aaron Meurer -- You received this message because you are subscribed to the Google Groups "sympy" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/sympy?hl=en.
