P Purkayastha <ppu...@gmail.com> writes:
> On Friday, February 24, 2012 7:40:07 PM UTC+8, Keshav Kini wrote:
> Eh?! I set up my local branch to track the remote/github-master branch because
> I wanted to read the README.rst sometime (Yeah I know I could change branches
> and then read it ;)).
Well, the README.rst is not in the Sage library so if you tried to
create a patch against the Sage library it would include the addition of
README.rst . That's why I didn't want people committing on top of it.
Also, I kept rebasing that branch on each new release of Sage, so that
the dev releases Jeroen keeps abandoning would not have any children
tying them down to the history graph, making it difficult to delete them
later. That's another reason not to have people committing on top of it.
The new Wiki page is essentially the same as the old README.rst .
To cut out a sequence of commits from a branch, do
$ git checkout branch-name
$ git rebase B --onto A
where A and B are as follows:
<-- past future -->
- - - O --- A --- O --- O --- O --- B --- O --- O - - - - - - HEAD
^^^^^^^^^^^^^^^^^^^^^^^
I want to get rid of these commits
This will attempt to figure out what happened between B and HEAD (hence
"git rebase B", and apply it directly to A (hence "--onto A"), skipping
the commits you wanted to remove.
If you cloned sagemath/sagelib on github before I deleted the
github-master branch, haven't modified any of the branches (only created
your own ones), and want to rebase your branches so that they do not
depend on the README.rst commits I made, then the A and B you want above
will be "master" and "github-master" respectively, hence
$ git checkout your-branch-name
$ git rebase github-master --onto master
-Keshav
----
Join us in #sagemath on irc.freenode.net !
--
To post to this group, send an email to sage-devel@googlegroups.com
To unsubscribe from this group, send an email to
sage-devel+unsubscr...@googlegroups.com
For more options, visit this group at http://groups.google.com/group/sage-devel
URL: http://www.sagemath.org
