Fossil

All files named "www/rebaseharm.md"
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

History for www/rebaseharm.md (color-coded by user)

2024-02-18
14:59
Centered the Pikchrs in the rebaseharm doc, and replaced an HTML table with the MD equivalent. file: [fdd2cef342] check-in: [9607f5b4e4] user: wyoung branch: trunk, size: 22798
2023-05-10
17:50
Replaced use of the obsolete (because presentational) "center" tag in the docs with CSS equivalents. file: [ee60c4c186] check-in: [4d21ec88ea] user: wyoung branch: trunk, size: 22723
2021-09-17
02:02
Converted all uses of the [https://developer.mozilla.org/en-US/docs/Web/HTML/Element/a#attr-name | obsolete] named anchor feature from HTML before 4.0 to use fragment identifiers instead. (<tt>www/*</tt> subtree only.) Where possible, changed constructs like <verbatim><a name="foo"></a><h3></verbatim> to <verbatim><h3 id="foo"></verbatim> Also fixed a few cases where the link target came after a header so the browser would scroll the header off the screen when visiting the targeted section. Added a 50em pad at the bottom of one such edited doc to allow the intra-doc link targets to be useful since it's a short enough doc that on sufficiently tall browser windows, scrolling isn't possible, so using those anchors has no visible effect. file: [3e1640e822] check-in: [93cee1f56e] user: wyoung branch: trunk, size: 22692
2021-03-26
17:54
Remove inflammatory language about "lying" from the "rebase considered harmful" article. file: [62b958d3a8] check-in: [19d0a94a7b] user: drh branch: trunk, size: 22720
2021-01-12
16:00
Fix typos in Markdown and Wiki pages. file: [69fe5c22b9] check-in: [e755561d73] user: danield branch: trunk, size: 23060
2020-12-10
21:43
Bring branch up-to-date with respect to trunk. Note: this check-in was made as an example to demonstrate merging. file: [e0434b15d4] check-in: [bbc5264066] user: andygoth branch: modern-skin-markup-fixes, size: 23018
21:33
Reworked section 5.0 of the rebaseharm doc to be less controversial. Charged words are quotes from the Git docs, not words we sling at it, etc. This also more clearly separates the "merge alternative" aspects of rebase from the history-mutating aspects. file: [a21ade941a] check-in: [1a4b8e5894] user: wyoung branch: trunk, size: 23061
2020-11-22
14:05
First in a potential series of many changes to doc markup in this repo (especially to www/*) to work better with the Inskinerator project's Modern override. This one changes an explicit HTML table in www/rebaseharm.md to a Markdown table so our CSS can take full effect. file: [cfa4ee932a] check-in: [facb988055] user: wyoung branch: modern-skin-markup-fixes, size: 23585
2020-10-11
07:03
Attempt to use the feature added in [e32214a409] to extract the duplicate Pikchr code for diagram #4 in the rebase doc as a separate file, so we can refer to it twice via a Markdown image link instead. Doesn't work, but my next steps require a checkin I can reference. EDIT: Per forum feedback (https://fossil-scm.org/forum/forumpost/5c177b55b6) I'm abandoning this. file: [2d4a904211] check-in: [a9dcda5dfd] user: wyoung branch: extract-pikchr, size: 22229
2020-10-01
21:21
Clarity pass on the rebaseharm doc following the recent Hacker News thread, to address confusions that came up there. file: [7c0d45b467] check-in: [068e26af37] user: wyoung branch: trunk, size: 23628
20:59
Removed point 4.0 from the rebaseharm doc: it said that rebase is a problem because Git makes the change immediately to the blockchain, but that's a problem with Git in general, due to its commit-then-push model, not a problem with rebase in particular. If Fossil had a rebase feature, there is no good reason to believe we would do this as well. Therefore, this point is a distraction from the main argument. Besides, we already cover it as fossil-v-git.wiki#testing. file: [80ec8a81e5] check-in: [6e0dba257b] user: wyoung branch: trunk, size: 22877
20:37
The rebaseharm.md doc referred to rebase04.svg *twice*, so while all SVGs associated with the doc were replaced, the second became a broken link when the SVG files were removed. Simply duplicating the code with comments to try to stave off version drift for now. file: [997710d398] check-in: [a61ac66b63] user: wyoung branch: trunk, size: 23736
2020-09-30
10:30
Added "toggle" attributes to the pikchrs in the branching and rebase harm docs, so they act as inline examples of the tech. file: [0c3b4906ea] check-in: [01f6ed9c9a] user: wyoung branch: trunk, size: 23001
2020-09-19
00:44
Convert the diagrams in the "Rebase Considered Harmful" document over to Pikchr. file: [623cdc118e] check-in: [38d6a8f30e] user: drh branch: trunk, size: 22966
2020-04-23
17:26
Rewrote a paragraph in sec.7.2 of the rebaseharm doc for clarity. file: [cb0befdc92] check-in: [b16db9d6e9] user: wyoung branch: trunk, size: 20825
2020-03-06
10:06
eol-spacing in documentation file: [a3f5f7f929] check-in: [d65540f5a9] user: jan.nijtmans branch: trunk, size: 20763
2020-02-07
01:54
Addressed forum comment on recent rebaseharm doc update: https://www.fossil-scm.org/forum/forumpost/567804d6fa file: [32d20b663a] check-in: [be9df83b42] user: wyoung branch: trunk, size: 20777
2020-02-05
22:11
Assorted improvements to rebaseharm, mainly grammar and clarity, but also some typo fixes. file: [3c95a69491] check-in: [5a7cda57cb] user: wyoung branch: trunk, size: 20759
14:41
Still more editorial changes to rebaseharm.md. file: [8b1e173335] check-in: [9b068a3979] user: drh branch: trunk, size: 20692
13:52
Still more minor edits to the rebaseharm.md document. file: [82e9bde4a6] check-in: [d0807c23ea] user: drh branch: trunk, size: 20403
13:45
Fix typos and remove unnecessary non-ASCII characters from the rebaseharm document. file: [0ef36a7737] check-in: [6a903b39e8] user: drh branch: trunk, size: 20417
13:22
Rework the "rebase is lying" section of the "Rebase considered harmful" document to be less confrontational, while at the same time still calling out rebase for what it really is. file: [e033d5e1f5] check-in: [629259df14] user: drh branch: trunk, size: 20462
2019-10-21
03:22
Put 7.x series headlines one level deeper so they nest properly under their parent, the 7.0 section, in rebaseharm.md doc. file: [f84f21b6e0] check-in: [5453dbff5b] user: wyoung branch: trunk, size: 19855
2019-09-13
12:40
Enhance the title for the /finfo page when the ubg query parameter is present. Use the ubg query parameter for the document history link on the rebaseharm.md page. file: [c8576839e3] check-in: [80f982518b] user: drh branch: trunk, size: 19850
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. file: [9b3f89e894] check-in: [c71fe99f9b] user: wyoung branch: trunk, size: 19875
09:25
Added a few paras to section 3.0 in rebaseharm.md, giving consequences of siloed development in Socratic fashion. file: [195919e7d2] check-in: [924bf44d39] user: wyoung branch: trunk, size: 12118
09:23
Assorted grammar and spelling fixes in www/rebaseharm.md. Also added named anchors to all of the sections. file: [f3e7aa95db] check-in: [cd689b3813] user: wyoung branch: trunk, size: 11334
2019-09-06
20:38
Minor editorial changes to rebaseharm.md, in an attempt to improve clarity and readability. file: [dc2bc83e3e] check-in: [9b32c180eb] user: drh branch: trunk, size: 10970
14:39
Fix a typo in the rebaseharm.md document. file: [b0e7513730] check-in: [82f75864d5] user: drh branch: trunk, size: 10924
2019-09-05
13:33
Remove the "Draft" notation from the rebase document. Link the new document into the documentation index. file: [a893fb8d2b] check-in: [569cc741d6] user: drh branch: trunk, size: 10920
03:45
Replaced ASCII art diagrams in the new rebase document with yEd SVG diagrams. Same semantic content. file: [5f46af82f3] check-in: [d6222f8945] user: wyoung branch: trunk, size: 10986
01:39
Correct a minor grammatical error in a sentence for new rebase document. file: [33f9b32320] check-in: [049c42df2a] user: andybradford branch: trunk, size: 11492
00:41
Fixed a few spelling and grammar errors in www/rebaseharm.md file: [1510845a18] check-in: [708696d88a] user: wyoung branch: trunk, size: 11491
2019-09-04
20:09
Add section numbers to the Rebase document. file: [258052d2bc] check-in: [237bde9638] user: drh branch: trunk, size: 11494
20:02
More typo fixes in the Rebase document. file: [e454deac92] check-in: [aaacce23cd] user: drh branch: trunk, size: 11392
19:34
Fix a typo in the Rebase document. file: [2a565373de] check-in: [18e58e29cc] user: drh branch: trunk, size: 11398
19:23
Minor edits to Rebase Considered Harmful, for clarity. file: [98c48c2573] check-in: [a2ea815183] user: drh branch: trunk, size: 11392
19:04
Added: Add initial draft of the "Rebase Considered Harmful" document. file: [f0cc2af538] check-in: [4f79941f9e] user: drh branch: trunk, size: 11419