Fossil SCM
Added recommendation for Patchouli in the gitusers doc, as an alternative to git rebase -i.
Commit
0564a6a68d3b7cbd5f8f2fafa4df1bf644b1036e2bcab2adacf4e8f9939742e8
Parent
1a4b8e58940beba…
1 file changed
+23
+23
| --- www/gitusers.md | ||
| +++ www/gitusers.md | ||
| @@ -633,10 +633,33 @@ | ||
| 633 | 633 | common objections as well. Chances are not good that you are going to |
| 634 | 634 | come up with a new objection that we haven’t already considered and |
| 635 | 635 | addressed there. |
| 636 | 636 | |
| 637 | 637 | [3]: ./rebaseharm.md |
| 638 | + | |
| 639 | + | |
| 640 | +## <a id="split"></a> Commit Splitting | |
| 641 | + | |
| 642 | +Although Fossil is [highly unlikely to get rebasing](#rebase), there is | |
| 643 | +one sub-feature of `git rebase` that currently has no functional | |
| 644 | +equivalent in Fossil yet which is philosophically compatible with it: | |
| 645 | +[commit splitting][gcspl]. | |
| 646 | + | |
| 647 | +We’ve discussed designs for getting such a feature in Fossil without | |
| 648 | +resorting to the history-rewriting features of `git rebase`, such as an | |
| 649 | +interactive form of [`fossil stash apply`][stash]. Until someone gets | |
| 650 | +around to providing such a feature, we suggest that you try [Patchouli]. | |
| 651 | + | |
| 652 | +To contrast this with `git rebase -i`, you don’t commit a large change | |
| 653 | +set and then rewrite history to split it up, you produce a patch file | |
| 654 | +(`fossil diff -i > my-changes.patch`) and then apply a subset of those | |
| 655 | +changes to the Fossil working tree, test the result, and commit. | |
| 656 | + | |
| 657 | +[gcspl]: https://git-scm.com/docs/git-rebase#_splitting_commits | |
| 658 | +[Patchouli]: https://pypi.org/project/patchouli/ | |
| 659 | + | |
| 660 | + | |
| 638 | 661 | |
| 639 | 662 | |
| 640 | 663 | ## <a id="show"></a> Showing Information About Commits |
| 641 | 664 | |
| 642 | 665 | While there is no direct equivalent to Git’s “`show`” command, similar |
| 643 | 666 |
| --- www/gitusers.md | |
| +++ www/gitusers.md | |
| @@ -633,10 +633,33 @@ | |
| 633 | common objections as well. Chances are not good that you are going to |
| 634 | come up with a new objection that we haven’t already considered and |
| 635 | addressed there. |
| 636 | |
| 637 | [3]: ./rebaseharm.md |
| 638 | |
| 639 | |
| 640 | ## <a id="show"></a> Showing Information About Commits |
| 641 | |
| 642 | While there is no direct equivalent to Git’s “`show`” command, similar |
| 643 |
| --- www/gitusers.md | |
| +++ www/gitusers.md | |
| @@ -633,10 +633,33 @@ | |
| 633 | common objections as well. Chances are not good that you are going to |
| 634 | come up with a new objection that we haven’t already considered and |
| 635 | addressed there. |
| 636 | |
| 637 | [3]: ./rebaseharm.md |
| 638 | |
| 639 | |
| 640 | ## <a id="split"></a> Commit Splitting |
| 641 | |
| 642 | Although Fossil is [highly unlikely to get rebasing](#rebase), there is |
| 643 | one sub-feature of `git rebase` that currently has no functional |
| 644 | equivalent in Fossil yet which is philosophically compatible with it: |
| 645 | [commit splitting][gcspl]. |
| 646 | |
| 647 | We’ve discussed designs for getting such a feature in Fossil without |
| 648 | resorting to the history-rewriting features of `git rebase`, such as an |
| 649 | interactive form of [`fossil stash apply`][stash]. Until someone gets |
| 650 | around to providing such a feature, we suggest that you try [Patchouli]. |
| 651 | |
| 652 | To contrast this with `git rebase -i`, you don’t commit a large change |
| 653 | set and then rewrite history to split it up, you produce a patch file |
| 654 | (`fossil diff -i > my-changes.patch`) and then apply a subset of those |
| 655 | changes to the Fossil working tree, test the result, and commit. |
| 656 | |
| 657 | [gcspl]: https://git-scm.com/docs/git-rebase#_splitting_commits |
| 658 | [Patchouli]: https://pypi.org/project/patchouli/ |
| 659 | |
| 660 | |
| 661 | |
| 662 | |
| 663 | ## <a id="show"></a> Showing Information About Commits |
| 664 | |
| 665 | While there is no direct equivalent to Git’s “`show`” command, similar |
| 666 |