Nico Williams <n...@cryptonector.com> wrote: >Rebase is one of teh killer features of git.
It certainly kills any interest I have in using git on a regular basis. >How many times have you submitted a patch to an upstream and then been >told to make a bunch of changes, re-organize your commits, make >specific changes to specific commits, and/or squash commits? Yeah, >that's why rebase is good. None. Zero. Nada. Never. The thing is, I actually submit a *patch*, not a pull request or a commit history or anything that would invite such a request. That's also how I work merges between branches: the mrege is a single commit that incorportes all the changes from the other branch, or on rare occaisions a cherry-picked set of changes. The history is still there in the old branch if I want to review it, but the commit log for the trunk is nice and clean. That's one of the philosophical differences that determine which of the DSCMs you want to use. If the philosophy is that history is important, then you never rebase, and nobody would dream of asking you to make changes to your commits beyond making the comments more accurate. Rebase is not merely unnecessary, but anathema. If, on the other hand, the repository is considered to be part of the public face of the project like user docs or the web site, then editing it for readability and marketing purposes is SOP, and rebase is a critical tool. >Fossil is designed to avoid destructive operations. Rebasing is a >destructive operation. A compromise would be to allow rebasing but >into a new branch, leaving the original alone -- this is how I do >rebases in git anyways. I think you need to be mor explicit. Rebase is used for a number of different things, most in my (admittadly limited) experience with rebase it involves moving one branchinto another. It sounds like you're wanting to use it to rewrite a single branches history onto a new branch. If that's the case, can't you just do it with a series of cherry-picked merges? If so, could provide an example and show how rebase would make it easier? If not, maybe explain what you want to do? -- Sent from my Android tablet with K-9 Mail. Please excuse my swyping. _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
