Fossil

Check-in [82f75864]
Login

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

Overview
Comment:Fix a typo in the rebaseharm.md document.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 82f75864d5664a1ea7c9a9d6f258f8c733313883c0066736b8cc81f74824ca1e
User & Date: drh 2019-09-06 14:39:00
Context
2019-09-06
20:38
Minor editorial changes to rebaseharm.md, in an attempt to improve clarity and readability. check-in: 9b32c180 user: drh tags: trunk
14:39
Fix a typo in the rebaseharm.md document. check-in: 82f75864 user: drh tags: trunk
14:01
Include new repolist-skin setting in list of all settings so tests will pass. check-in: 2e3bffaa user: andybradford tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to www/rebaseharm.md.

201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
or clarifications to historical check-ins in its blockchain.  Hence,
once again, rebase can be seen as an attempt to work around limitations
of Git.  Wouldn't it be better to fix the tool rather than to lie about
the project history?

## 7.0 Cherry-pick merges work better then rebase

Perhaps there some cases where a rebase-like transformation
is actually helpful.  But those cases are rare.  And when they do
come up, running a series of cherry-pick merges achieve the same
topology, but with advantages:

  1.  Cherry-pick merges preserve an honest record of history.
      (They do in Fossil at least.  Git's file format does not have
      a slot to record cherry-pick merge history, unfortunately.)







|







201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
or clarifications to historical check-ins in its blockchain.  Hence,
once again, rebase can be seen as an attempt to work around limitations
of Git.  Wouldn't it be better to fix the tool rather than to lie about
the project history?

## 7.0 Cherry-pick merges work better then rebase

Perhaps there are some cases where a rebase-like transformation
is actually helpful.  But those cases are rare.  And when they do
come up, running a series of cherry-pick merges achieve the same
topology, but with advantages:

  1.  Cherry-pick merges preserve an honest record of history.
      (They do in Fossil at least.  Git's file format does not have
      a slot to record cherry-pick merge history, unfortunately.)