Fossil SCM

Addressed forum comment on recent rebaseharm doc update: https://www.fossil-scm.org/forum/forumpost/567804d6fa

wyoung 2020-02-07 01:54 trunk
Commit be9df83b420a3f8e385ececea4c173128c514decd5c18033c32de4d333e13d69
1 file changed +1 -1
--- www/rebaseharm.md
+++ www/rebaseharm.md
@@ -82,11 +82,11 @@
8282
8383
You could choose to collapse C3\' and C5\' into a single check-in
8484
as part of this rebase, but that's a side issue we'll deal with
8585
[separately](#collapsing).
8686
87
-Fossil lacks rebase, so the closest you can get to this same check-in
87
+Because Fossil purposefully lacks rebase, the closest you can get to this same check-in
8888
history is the following merge:
8989
9090
![merged feature branch](./rebase05.svg)
9191
9292
Check-ins C5\' and C7 check-ins hold identical code. The only
9393
--- www/rebaseharm.md
+++ www/rebaseharm.md
@@ -82,11 +82,11 @@
82
83 You could choose to collapse C3\' and C5\' into a single check-in
84 as part of this rebase, but that's a side issue we'll deal with
85 [separately](#collapsing).
86
87 Fossil lacks rebase, so the closest you can get to this same check-in
88 history is the following merge:
89
90 ![merged feature branch](./rebase05.svg)
91
92 Check-ins C5\' and C7 check-ins hold identical code. The only
93
--- www/rebaseharm.md
+++ www/rebaseharm.md
@@ -82,11 +82,11 @@
82
83 You could choose to collapse C3\' and C5\' into a single check-in
84 as part of this rebase, but that's a side issue we'll deal with
85 [separately](#collapsing).
86
87 Because Fossil purposefully lacks rebase, the closest you can get to this same check-in
88 history is the following merge:
89
90 ![merged feature branch](./rebase05.svg)
91
92 Check-ins C5\' and C7 check-ins hold identical code. The only
93

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button