Fossil SCM
Reflected the GitHub change of "master" to "main" into our gitusers.md doc.
Commit
b0ee3d5d75b38fffb41a2dc8bfd3d522930ba5ff50f47787e7e9c2c1522d56e2
Parent
3449d9cee9d6dad…
1 file changed
+8
-5
+8
-5
| --- www/gitusers.md | ||
| +++ www/gitusers.md | ||
| @@ -104,21 +104,24 @@ | ||
| 104 | 104 | Fossil does not support the concept of syncing, pushing, or pulling |
| 105 | 105 | individual branches. When you sync/push/pull in Fossil, you sync/push/pull |
| 106 | 106 | everything - all branches, all wiki, all tickets, all forum posts, |
| 107 | 107 | all tags, all technotes - everything. |
| 108 | 108 | |
| 109 | -## The Main Branch Is Called "`trunk`", not "`master`" | |
| 109 | +## The Main Branch Is Called "`trunk`" | |
| 110 | 110 | |
| 111 | 111 | In Fossil, the traditional name and the default name for the main branch |
| 112 | 112 | is "`trunk`". The "`trunk`" branch in Fossil corresponds to the |
| 113 | -"`master`" branch in Git. | |
| 113 | +"`master`" branch in stock Git or the "`main`" branch in GitHub. | |
| 114 | 114 | |
| 115 | -These naming conventions are so embedded in each system, that the | |
| 116 | -"trunk" branch name is automatically translated to "master" when | |
| 117 | -a [Fossil repo is mirrored to GitHub][6]. | |
| 115 | +Because the `fossil git export` command has to work with both stock Git | |
| 116 | +and with GitHub, Fossil uses Git’s default: your Fossil repo’s “trunk” | |
| 117 | +branch becomes “master” on GitHub, not “main,” as in new GitHub repos. | |
| 118 | +It is not known what happens on subsequent exports if you | |
| 119 | +[later rename it][ghmain]. | |
| 118 | 120 | |
| 119 | 121 | [6]: ./mirrortogithub.md |
| 122 | +[ghmain]: https://github.com/github/renaming | |
| 120 | 123 | |
| 121 | 124 | ## The "`fossil status`" Command Does Not Show Unmanaged Files |
| 122 | 125 | |
| 123 | 126 | The "`fossil status`" command shows you what files in your check-out have |
| 124 | 127 | been edited and scheduled for adding or removing at the next commit. |
| 125 | 128 |
| --- www/gitusers.md | |
| +++ www/gitusers.md | |
| @@ -104,21 +104,24 @@ | |
| 104 | Fossil does not support the concept of syncing, pushing, or pulling |
| 105 | individual branches. When you sync/push/pull in Fossil, you sync/push/pull |
| 106 | everything - all branches, all wiki, all tickets, all forum posts, |
| 107 | all tags, all technotes - everything. |
| 108 | |
| 109 | ## The Main Branch Is Called "`trunk`", not "`master`" |
| 110 | |
| 111 | In Fossil, the traditional name and the default name for the main branch |
| 112 | is "`trunk`". The "`trunk`" branch in Fossil corresponds to the |
| 113 | "`master`" branch in Git. |
| 114 | |
| 115 | These naming conventions are so embedded in each system, that the |
| 116 | "trunk" branch name is automatically translated to "master" when |
| 117 | a [Fossil repo is mirrored to GitHub][6]. |
| 118 | |
| 119 | [6]: ./mirrortogithub.md |
| 120 | |
| 121 | ## The "`fossil status`" Command Does Not Show Unmanaged Files |
| 122 | |
| 123 | The "`fossil status`" command shows you what files in your check-out have |
| 124 | been edited and scheduled for adding or removing at the next commit. |
| 125 |
| --- www/gitusers.md | |
| +++ www/gitusers.md | |
| @@ -104,21 +104,24 @@ | |
| 104 | Fossil does not support the concept of syncing, pushing, or pulling |
| 105 | individual branches. When you sync/push/pull in Fossil, you sync/push/pull |
| 106 | everything - all branches, all wiki, all tickets, all forum posts, |
| 107 | all tags, all technotes - everything. |
| 108 | |
| 109 | ## The Main Branch Is Called "`trunk`" |
| 110 | |
| 111 | In Fossil, the traditional name and the default name for the main branch |
| 112 | is "`trunk`". The "`trunk`" branch in Fossil corresponds to the |
| 113 | "`master`" branch in stock Git or the "`main`" branch in GitHub. |
| 114 | |
| 115 | Because the `fossil git export` command has to work with both stock Git |
| 116 | and with GitHub, Fossil uses Git’s default: your Fossil repo’s “trunk” |
| 117 | branch becomes “master” on GitHub, not “main,” as in new GitHub repos. |
| 118 | It is not known what happens on subsequent exports if you |
| 119 | [later rename it][ghmain]. |
| 120 | |
| 121 | [6]: ./mirrortogithub.md |
| 122 | [ghmain]: https://github.com/github/renaming |
| 123 | |
| 124 | ## The "`fossil status`" Command Does Not Show Unmanaged Files |
| 125 | |
| 126 | The "`fossil status`" command shows you what files in your check-out have |
| 127 | been edited and scheduled for adding or removing at the next commit. |
| 128 |