Fossil SCM
Fix a typo in the rebaseharm.md document.
Commit
82f75864d5664a1ea7c9a9d6f258f8c733313883c0066736b8cc81f74824ca1e
Parent
2e3bffaa7de07ac…
1 file changed
+1
-1
+1
-1
| --- www/rebaseharm.md | ||
| +++ www/rebaseharm.md | ||
| @@ -203,11 +203,11 @@ | ||
| 203 | 203 | of Git. Wouldn't it be better to fix the tool rather than to lie about |
| 204 | 204 | the project history? |
| 205 | 205 | |
| 206 | 206 | ## 7.0 Cherry-pick merges work better then rebase |
| 207 | 207 | |
| 208 | -Perhaps there some cases where a rebase-like transformation | |
| 208 | +Perhaps there are some cases where a rebase-like transformation | |
| 209 | 209 | is actually helpful. But those cases are rare. And when they do |
| 210 | 210 | come up, running a series of cherry-pick merges achieve the same |
| 211 | 211 | topology, but with advantages: |
| 212 | 212 | |
| 213 | 213 | 1. Cherry-pick merges preserve an honest record of history. |
| 214 | 214 |
| --- www/rebaseharm.md | |
| +++ www/rebaseharm.md | |
| @@ -203,11 +203,11 @@ | |
| 203 | of Git. Wouldn't it be better to fix the tool rather than to lie about |
| 204 | the project history? |
| 205 | |
| 206 | ## 7.0 Cherry-pick merges work better then rebase |
| 207 | |
| 208 | Perhaps there some cases where a rebase-like transformation |
| 209 | is actually helpful. But those cases are rare. And when they do |
| 210 | come up, running a series of cherry-pick merges achieve the same |
| 211 | topology, but with advantages: |
| 212 | |
| 213 | 1. Cherry-pick merges preserve an honest record of history. |
| 214 |
| --- www/rebaseharm.md | |
| +++ www/rebaseharm.md | |
| @@ -203,11 +203,11 @@ | |
| 203 | of Git. Wouldn't it be better to fix the tool rather than to lie about |
| 204 | the project history? |
| 205 | |
| 206 | ## 7.0 Cherry-pick merges work better then rebase |
| 207 | |
| 208 | Perhaps there are some cases where a rebase-like transformation |
| 209 | is actually helpful. But those cases are rare. And when they do |
| 210 | come up, running a series of cherry-pick merges achieve the same |
| 211 | topology, but with advantages: |
| 212 | |
| 213 | 1. Cherry-pick merges preserve an honest record of history. |
| 214 |