Fossil SCM
Correct a minor grammatical error in a sentence for new rebase document.
Commit
049c42df2ae4c08299ab6315a95415aa592182d53a617c891fb6f8622e6a5af7
Parent
708696d88ae4935…
1 file changed
+1
-1
+1
-1
| --- www/rebaseharm.md | ||
| +++ www/rebaseharm.md | ||
| @@ -60,11 +60,11 @@ | ||
| 60 | 60 | desirable and edifying, but retaining the option to show the real, |
| 61 | 61 | complete, messy history for cases where detail and accuracy are more |
| 62 | 62 | important. |
| 63 | 63 | |
| 64 | 64 | So, another way of thinking about rebase is that it is a kind of |
| 65 | -merge the intentionally forgets some details in order to | |
| 65 | +merge that intentionally forgets some details in order to | |
| 66 | 66 | not overwhelm the weak history display mechanisms available in Git. |
| 67 | 67 | |
| 68 | 68 | ### 2.1 Rebase does not actually provide better feature-branch diffs |
| 69 | 69 | |
| 70 | 70 | Another argument, often cited, is that rebasing a feature branch |
| 71 | 71 |
| --- www/rebaseharm.md | |
| +++ www/rebaseharm.md | |
| @@ -60,11 +60,11 @@ | |
| 60 | desirable and edifying, but retaining the option to show the real, |
| 61 | complete, messy history for cases where detail and accuracy are more |
| 62 | important. |
| 63 | |
| 64 | So, another way of thinking about rebase is that it is a kind of |
| 65 | merge the intentionally forgets some details in order to |
| 66 | not overwhelm the weak history display mechanisms available in Git. |
| 67 | |
| 68 | ### 2.1 Rebase does not actually provide better feature-branch diffs |
| 69 | |
| 70 | Another argument, often cited, is that rebasing a feature branch |
| 71 |
| --- www/rebaseharm.md | |
| +++ www/rebaseharm.md | |
| @@ -60,11 +60,11 @@ | |
| 60 | desirable and edifying, but retaining the option to show the real, |
| 61 | complete, messy history for cases where detail and accuracy are more |
| 62 | important. |
| 63 | |
| 64 | So, another way of thinking about rebase is that it is a kind of |
| 65 | merge that intentionally forgets some details in order to |
| 66 | not overwhelm the weak history display mechanisms available in Git. |
| 67 | |
| 68 | ### 2.1 Rebase does not actually provide better feature-branch diffs |
| 69 | |
| 70 | Another argument, often cited, is that rebasing a feature branch |
| 71 |