https://chiselapp.com/user/nico/repository/nico
Two branches: rebase, and test-rebase. This adds a --nocommit option to the fossil merge command that does... what it sounds like it does: it applies the patch from a --cherrypick commit and leaves that uncommitted. I applied all the commits from my rebase branch onto my test-rebase branch, each time using --cherrypick and --nocommit, then did a single commit at the end, and the result is that src/merge.c in both branches has the same contents. (www/index.wiki doesn't, and I suspect this is due to fossil automerging silently, which I wish it wouldn't do). An actual, interactive rebase facility like git's can be constructed on top of this, though some things, like interactive patch chunk selection/editing, will require more work here. Cheers, Nico -- _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
