Fossil SCM
Updated a few references to Git's "master" branch in the docs to track the addition of "fossil git export --mainbranch".
Commit
aca011c5e5082ccce789e67a108ce556f3f92da178b783b889cbc588286e4019
Parent
20512bd8459e0c0…
3 files changed
+2
-1
+2
-1
+2
-1
+2
-1
| --- www/gitusers.md | ||
| +++ www/gitusers.md | ||
| @@ -634,11 +634,12 @@ | ||
| 634 | 634 | "`master`" branch in stock Git or to [the “`main`” branch in GitHub][mbgh]. |
| 635 | 635 | |
| 636 | 636 | Because the `fossil git export` command has to work with both stock Git |
| 637 | 637 | and with GitHub, Fossil uses Git’s traditional default rather than |
| 638 | 638 | GitHub’s new default: your Fossil repo’s “trunk” branch becomes “master” |
| 639 | -when [mirroring to GitHub][mirgh], not “main.” | |
| 639 | +when [mirroring to GitHub][mirgh] unless you give the `--mainbranch` | |
| 640 | +option added in Fossil 2.14. | |
| 640 | 641 | |
| 641 | 642 | We do not know what happens on subsequent exports if you later rename |
| 642 | 643 | this branch on the GitHub side. |
| 643 | 644 | |
| 644 | 645 | [mbgh]: https://github.com/github/renaming |
| 645 | 646 |
| --- www/gitusers.md | |
| +++ www/gitusers.md | |
| @@ -634,11 +634,12 @@ | |
| 634 | "`master`" branch in stock Git or to [the “`main`” branch in GitHub][mbgh]. |
| 635 | |
| 636 | Because the `fossil git export` command has to work with both stock Git |
| 637 | and with GitHub, Fossil uses Git’s traditional default rather than |
| 638 | GitHub’s new default: your Fossil repo’s “trunk” branch becomes “master” |
| 639 | when [mirroring to GitHub][mirgh], not “main.” |
| 640 | |
| 641 | We do not know what happens on subsequent exports if you later rename |
| 642 | this branch on the GitHub side. |
| 643 | |
| 644 | [mbgh]: https://github.com/github/renaming |
| 645 |
| --- www/gitusers.md | |
| +++ www/gitusers.md | |
| @@ -634,11 +634,12 @@ | |
| 634 | "`master`" branch in stock Git or to [the “`main`” branch in GitHub][mbgh]. |
| 635 | |
| 636 | Because the `fossil git export` command has to work with both stock Git |
| 637 | and with GitHub, Fossil uses Git’s traditional default rather than |
| 638 | GitHub’s new default: your Fossil repo’s “trunk” branch becomes “master” |
| 639 | when [mirroring to GitHub][mirgh] unless you give the `--mainbranch` |
| 640 | option added in Fossil 2.14. |
| 641 | |
| 642 | We do not know what happens on subsequent exports if you later rename |
| 643 | this branch on the GitHub side. |
| 644 | |
| 645 | [mbgh]: https://github.com/github/renaming |
| 646 |
+2
-1
| --- www/mirrortogithub.md | ||
| +++ www/mirrortogithub.md | ||
| @@ -107,11 +107,12 @@ | ||
| 107 | 107 | Git. Be careful not to mess with the `.mirror_state` directory or |
| 108 | 108 | any of its contents. Do not put those files under Git management. Do |
| 109 | 109 | not edit or delete them. |
| 110 | 110 | |
| 111 | 111 | * The name of the "trunk" branch is automatically translated into "master" |
| 112 | - in the Git mirror. | |
| 112 | + in the Git mirror unless you give the `--mainbranch` option, | |
| 113 | + added in Fossil 2.14. | |
| 113 | 114 | |
| 114 | 115 | * Only check-ins and simple tags are translated to Git. Git does not |
| 115 | 116 | support wiki or tickets or unversioned content or any of the other |
| 116 | 117 | features of Fossil that make it so convenient to use, so those other |
| 117 | 118 | elements cannot be mirrored in Git. |
| 118 | 119 |
| --- www/mirrortogithub.md | |
| +++ www/mirrortogithub.md | |
| @@ -107,11 +107,12 @@ | |
| 107 | Git. Be careful not to mess with the `.mirror_state` directory or |
| 108 | any of its contents. Do not put those files under Git management. Do |
| 109 | not edit or delete them. |
| 110 | |
| 111 | * The name of the "trunk" branch is automatically translated into "master" |
| 112 | in the Git mirror. |
| 113 | |
| 114 | * Only check-ins and simple tags are translated to Git. Git does not |
| 115 | support wiki or tickets or unversioned content or any of the other |
| 116 | features of Fossil that make it so convenient to use, so those other |
| 117 | elements cannot be mirrored in Git. |
| 118 |
| --- www/mirrortogithub.md | |
| +++ www/mirrortogithub.md | |
| @@ -107,11 +107,12 @@ | |
| 107 | Git. Be careful not to mess with the `.mirror_state` directory or |
| 108 | any of its contents. Do not put those files under Git management. Do |
| 109 | not edit or delete them. |
| 110 | |
| 111 | * The name of the "trunk" branch is automatically translated into "master" |
| 112 | in the Git mirror unless you give the `--mainbranch` option, |
| 113 | added in Fossil 2.14. |
| 114 | |
| 115 | * Only check-ins and simple tags are translated to Git. Git does not |
| 116 | support wiki or tickets or unversioned content or any of the other |
| 117 | features of Fossil that make it so convenient to use, so those other |
| 118 | elements cannot be mirrored in Git. |
| 119 |
+2
-1
| --- www/whyusefossil.wiki | ||
| +++ www/whyusefossil.wiki | ||
| @@ -223,11 +223,12 @@ | ||
| 223 | 223 | a sequence of check-ins that are all linked |
| 224 | 224 | together in the DAG through the primary parent. |
| 225 | 225 | <ul> |
| 226 | 226 | <li><p>Branches are often given names which propagate to direct children. |
| 227 | 227 | The tradition in Fossil is to call the main branch "trunk". In |
| 228 | - Git, the main branch is usually called "master". | |
| 228 | + Git, it's called "master" by default, though some call it | |
| 229 | + something else, like "main". | |
| 229 | 230 | <li><p>It is possible to have multiple branches with the same name. |
| 230 | 231 | Fossil has no problem with this, but it can be confusing to |
| 231 | 232 | humans, so best practice is to give each branch a unique name. |
| 232 | 233 | <li><p>The name of a branch can be changed by adding special tags |
| 233 | 234 | to the first check-in of a branch. The name assigned by this |
| 234 | 235 |
| --- www/whyusefossil.wiki | |
| +++ www/whyusefossil.wiki | |
| @@ -223,11 +223,12 @@ | |
| 223 | a sequence of check-ins that are all linked |
| 224 | together in the DAG through the primary parent. |
| 225 | <ul> |
| 226 | <li><p>Branches are often given names which propagate to direct children. |
| 227 | The tradition in Fossil is to call the main branch "trunk". In |
| 228 | Git, the main branch is usually called "master". |
| 229 | <li><p>It is possible to have multiple branches with the same name. |
| 230 | Fossil has no problem with this, but it can be confusing to |
| 231 | humans, so best practice is to give each branch a unique name. |
| 232 | <li><p>The name of a branch can be changed by adding special tags |
| 233 | to the first check-in of a branch. The name assigned by this |
| 234 |
| --- www/whyusefossil.wiki | |
| +++ www/whyusefossil.wiki | |
| @@ -223,11 +223,12 @@ | |
| 223 | a sequence of check-ins that are all linked |
| 224 | together in the DAG through the primary parent. |
| 225 | <ul> |
| 226 | <li><p>Branches are often given names which propagate to direct children. |
| 227 | The tradition in Fossil is to call the main branch "trunk". In |
| 228 | Git, it's called "master" by default, though some call it |
| 229 | something else, like "main". |
| 230 | <li><p>It is possible to have multiple branches with the same name. |
| 231 | Fossil has no problem with this, but it can be confusing to |
| 232 | humans, so best practice is to give each branch a unique name. |
| 233 | <li><p>The name of a branch can be changed by adding special tags |
| 234 | to the first check-in of a branch. The name assigned by this |
| 235 |