Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.
|Comment:||Reworked the final paragraph of the new section 2.8 in fossil-v-git.wiki, adding in a mention of www/branching.wiki to the comparison, to make it fairer.|
|Downloads:||Tarball | ZIP archive | SQL archive|
|Timelines:||family | ancestors | descendants | both | trunk|
|Files:||files | file ages | folders|
|User & Date:||wyoung 2019-09-13 11:33:57|
|12:00||Added paragraph on feedback loops, control theory, and OODA to the fossil-v-git doc, distilling a recent discussion on the forum. (check-in: b0f2a48f user: wyoung tags: trunk)|
|11:33||Reworked the final paragraph of the new section 2.8 in fossil-v-git.wiki, adding in a mention of www/branching.wiki to the comparison, to make it fairer. (check-in: 8f7576b0 user: wyoung tags: trunk)|
|11:12||Added section "7.0 Collapsing check-ins throws away valuable information" to rebaseharm.md, linked to from the previous throwaway comment about squashing a whole branch down to a single commit during rebase. This section explains an entire class of harms that come from rebase which wasn't previously covered. (check-in: c71fe99f user: wyoung tags: trunk)|
Changes to www/fossil-v-git.wiki.
668 668 much work gets applied — just one check-in or a whole branch — and the 669 669 merge direction. This is the sort of thing we mean when we point out 670 670 that Fossil's command interface is simpler than Git's: there are fewer 671 671 concepts to keep track of in your mental model of Fossil's internal 672 672 operation. 673 673 674 674 Fossil's implementation of the feature is also simpler to describe. The 675 -online help for <tt> [/help?cmd=merge | fossil merge]</tt> is currently 676 -41 lines long, whereas the aggregate man page length for the above three 677 -Git commands is over 1000 lines, much of it mutually redundant. (e.g. 678 -the <tt>--edit</tt> and <tt>--no-commit</tt> options get described three 679 -different times, each time differently.) 675 +brief online help for <tt>[/help?cmd=merge | fossil merge]</tt> is 676 +currently 41 lines long, to which you want to add the 600 lines of 677 +[./branching.wiki | the branching document]. The equivalent 678 +documentation in Git is the aggregation of the man pages for the above 679 +three commands, which is over 1000 lines, much of it mutually redundant. 680 +(e.g. the <tt>--edit</tt> and <tt>--no-commit</tt> options get 681 +described three different times, each time differently.) Fossil's 682 +documentation is not only more concise, it gives a nice split of brief 683 +online help and full online documentation. 680 684 681 685 682 686 <h3 id="hash">2.9 Hash Algorithm: SHA-3 vs SHA-2 vs SHA-1</h3> 683 687 684 688 Fossil started out using 160-bit SHA-1 hashes to identify check-ins, 685 689 just as in Git. That changed in early 2017 when news of the 686 690 [https://shattered.io/|SHAttered attack] broke, demonstrating that SHA-1