On Wed, Dec 16, 2015 at 10:34 PM, Gaurav M. Bhandarkar < gaurav.a...@gmail.com> wrote:
> > Don't need rebase to use fast-forward merge. > > Normal merge or rebase both "enables" fast-forward merges. But the > advantage "rebase-before-ff-merge" has is that it avoids other(s) extra > "merge commits" that you would have done to get your branch updated with > changes from remote. > > See the section "Don't merge upstream code at random points": > https://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg39091.html > > > > You can use private branches to the same effect > I'm not sure. The thing that immediately comes to mind is that fossil's > private branches will show up as a single commit in the public branch. > It depends on how you go about it: Create a private branch off trunk. Edit, commit, do whatever you want with it. When you're finished and ready to rebase, create a public branch off trunk and cherry pick merge the private commits you want in the public history. You have as much opportunity as you want to clean and massage them. Now you can merge that branch to trunk. I'm not trying to suggest it is in any way nearly as "elegant" as "rebase -i" (those who prefer that would find this clunky at best). Still, it seems possible. -- Scott Robison
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
