Fossil SCM
(Grammar) gitusers.md - Expand a colloquial term.
Commit
6bd9009d72c87ac09fb39787268a1961240ecdf9fd18a468970458dce6ca6132
Parent
3fcd5bd44270c4c…
1 file changed
+1
-1
+1
-1
| --- www/gitusers.md | ||
| +++ www/gitusers.md | ||
| @@ -773,11 +773,11 @@ | ||
| 773 | 773 | hashes.) |
| 774 | 774 | |
| 775 | 775 | In this scheme, Alice then needs to say “`fossil update trunk`” in order |
| 776 | 776 | to return her check-out’s parent commit to the previous version lest her |
| 777 | 777 | next attempted commit land atop this mistake branch. The fact that Bob |
| 778 | -marked the branch as closed will prevent that from going thru, cluing | |
| 778 | +marked the branch as closed will prevent that from going through, cluing | |
| 779 | 779 | Alice into what she needs to do to remedy the situation, but that merely |
| 780 | 780 | shows why it’s a better workflow if Alice makes the amendment herself: |
| 781 | 781 | |
| 782 | 782 | ``` |
| 783 | 783 | fossil amend --branch MISTAKE --hide --close \ |
| 784 | 784 |
| --- www/gitusers.md | |
| +++ www/gitusers.md | |
| @@ -773,11 +773,11 @@ | |
| 773 | hashes.) |
| 774 | |
| 775 | In this scheme, Alice then needs to say “`fossil update trunk`” in order |
| 776 | to return her check-out’s parent commit to the previous version lest her |
| 777 | next attempted commit land atop this mistake branch. The fact that Bob |
| 778 | marked the branch as closed will prevent that from going thru, cluing |
| 779 | Alice into what she needs to do to remedy the situation, but that merely |
| 780 | shows why it’s a better workflow if Alice makes the amendment herself: |
| 781 | |
| 782 | ``` |
| 783 | fossil amend --branch MISTAKE --hide --close \ |
| 784 |
| --- www/gitusers.md | |
| +++ www/gitusers.md | |
| @@ -773,11 +773,11 @@ | |
| 773 | hashes.) |
| 774 | |
| 775 | In this scheme, Alice then needs to say “`fossil update trunk`” in order |
| 776 | to return her check-out’s parent commit to the previous version lest her |
| 777 | next attempted commit land atop this mistake branch. The fact that Bob |
| 778 | marked the branch as closed will prevent that from going through, cluing |
| 779 | Alice into what she needs to do to remedy the situation, but that merely |
| 780 | shows why it’s a better workflow if Alice makes the amendment herself: |
| 781 | |
| 782 | ``` |
| 783 | fossil amend --branch MISTAKE --hide --close \ |
| 784 |