Fossil SCM
Removed extra whitespace in command examples in fossil-v-git doc. Skin does that now.
Commit
b36872790418478639e14cc1ae20dd3921fef917af836b9fa53cd2360a6c2bd1
Parent
3e23092003065a5…
1 file changed
+6
-6
+6
-6
| --- www/fossil-v-git.wiki | ||
| +++ www/fossil-v-git.wiki | ||
| @@ -799,21 +799,21 @@ | ||
| 799 | 799 | |
| 800 | 800 | Incidentally, this is a good example of Git's messy command design. |
| 801 | 801 | These three commands: |
| 802 | 802 | |
| 803 | 803 | <pre> |
| 804 | - $ git merge HASH | |
| 805 | - $ git cherry-pick HASH | |
| 806 | - $ git revert HASH | |
| 804 | +$ git merge HASH | |
| 805 | +$ git cherry-pick HASH | |
| 806 | +$ git revert HASH | |
| 807 | 807 | </pre> |
| 808 | 808 | |
| 809 | 809 | ...are all the same command in Fossil: |
| 810 | 810 | |
| 811 | 811 | <pre> |
| 812 | - $ fossil merge HASH | |
| 813 | - $ fossil merge --cherrypick HASH | |
| 814 | - $ fossil merge --backout HASH | |
| 812 | +$ fossil merge HASH | |
| 813 | +$ fossil merge --cherrypick HASH | |
| 814 | +$ fossil merge --backout HASH | |
| 815 | 815 | </pre> |
| 816 | 816 | |
| 817 | 817 | If you think about it, they're all the same function: apply work done on |
| 818 | 818 | one branch to another. All that changes between these commands is how |
| 819 | 819 | much work gets applied — just one check-in or a whole branch — and the |
| 820 | 820 |
| --- www/fossil-v-git.wiki | |
| +++ www/fossil-v-git.wiki | |
| @@ -799,21 +799,21 @@ | |
| 799 | |
| 800 | Incidentally, this is a good example of Git's messy command design. |
| 801 | These three commands: |
| 802 | |
| 803 | <pre> |
| 804 | $ git merge HASH |
| 805 | $ git cherry-pick HASH |
| 806 | $ git revert HASH |
| 807 | </pre> |
| 808 | |
| 809 | ...are all the same command in Fossil: |
| 810 | |
| 811 | <pre> |
| 812 | $ fossil merge HASH |
| 813 | $ fossil merge --cherrypick HASH |
| 814 | $ fossil merge --backout HASH |
| 815 | </pre> |
| 816 | |
| 817 | If you think about it, they're all the same function: apply work done on |
| 818 | one branch to another. All that changes between these commands is how |
| 819 | much work gets applied — just one check-in or a whole branch — and the |
| 820 |
| --- www/fossil-v-git.wiki | |
| +++ www/fossil-v-git.wiki | |
| @@ -799,21 +799,21 @@ | |
| 799 | |
| 800 | Incidentally, this is a good example of Git's messy command design. |
| 801 | These three commands: |
| 802 | |
| 803 | <pre> |
| 804 | $ git merge HASH |
| 805 | $ git cherry-pick HASH |
| 806 | $ git revert HASH |
| 807 | </pre> |
| 808 | |
| 809 | ...are all the same command in Fossil: |
| 810 | |
| 811 | <pre> |
| 812 | $ fossil merge HASH |
| 813 | $ fossil merge --cherrypick HASH |
| 814 | $ fossil merge --backout HASH |
| 815 | </pre> |
| 816 | |
| 817 | If you think about it, they're all the same function: apply work done on |
| 818 | one branch to another. All that changes between these commands is how |
| 819 | much work gets applied — just one check-in or a whole branch — and the |
| 820 |