I'm not an expert on rebasing -- I've only done it a couple times, but as far as I know, rebasing changes the timeline of a branch (potentially radically). It lets you reorder commits, combine them together (squash them), and break them into multiple commits (edit them). I've only done interactive rebasing, which opens an editor with something like this in it (taken from this article, http://git-scm.com/book/en/Git-Tools-Rewriting-History ), listing the commits you want to edit from oldest to newest:
pick f7f3f6d changed my name a bit pick 310154e updated README formatting and added blame pick a5f4a0d added cat-file You then change the order of the lines and change whatever commands you want from pick to edit or squash, save the file, and exit the editor, allowing the rebase to continue. Squash combines a commit with the one before it. Edit drops you to command line, where you can create multiple commits and then returns you to the editor again with the new commits you made inserted in the list. Someone could certainly write a tool to do this in Fossil that creates a new branch. On Fri, Sep 14, 2012 at 11:12 AM, David Given <d...@cowlark.com> wrote: > Bill Burdick wrote: > [...] > > Who would want to have that? I think the Git community answers that. > > Anyone who wants to have a cleaner presentation of history than what > > actually happened. Being able to have a clean view without losing the > > actual history sounds like a good trick, to me, and it would answer the > > rebasing functionality gap that concerns some people. > > Would not the Fossil way to do this be to have two branches, one public > and one development, and have periodic merges across from the > development branch to the public branch? The public branch would have > the 'clean' history, with single checkins containing lots of files > representing complete features, but if anyone wants to see the details > they can follow the merge into the development branch and see how the > work was actually done. >
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
