diff options
| author | Timothée Ravier <travier@redhat.com> | 2021-05-07 16:42:37 +0200 |
|---|---|---|
| committer | Timothée Ravier <travier@redhat.com> | 2021-05-07 16:55:03 +0200 |
| commit | 02527f115e934d40a37a4b2b41f1a93eaf70732b (patch) | |
| tree | b08b769dbb945d65eb0faebbbf07cc836f7a01d6 /docs/repo.md | |
| parent | b8cca6cef14716987bbf7ef8f6edcbfc1688cc4c (diff) | |
| download | ostree-02527f115e934d40a37a4b2b41f1a93eaf70732b.tar.gz | |
*: rename master to main in tests & examples
Diffstat (limited to 'docs/repo.md')
| -rw-r--r-- | docs/repo.md | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/repo.md b/docs/repo.md index 0269934e..69f26172 100644 --- a/docs/repo.md +++ b/docs/repo.md @@ -123,16 +123,16 @@ commits. See the for information on how git uses them. Unlike git though, it doesn't usually make sense to have a "main" branch. There is a convention for references in OSTree that looks like this: -`exampleos/buildmaster/x86_64-runtime` and -`exampleos/buildmaster/x86_64-devel-debug`. These two refs point to +`exampleos/buildmain/x86_64-runtime` and +`exampleos/buildmain/x86_64-devel-debug`. These two refs point to two different generated filesystem trees. In this example, the "runtime" tree contains just enough to run a basic system, and "devel-debug" contains all of the developer tools and debuginfo. The `ostree` supports a simple syntax using the caret `^` to refer to the parent of a given commit. For example, -`exampleos/buildmaster/x86_64-runtime^` refers to the previous build, -and `exampleos/buildmaster/x86_64-runtime^^` refers to the one before +`exampleos/buildmain/x86_64-runtime^` refers to the previous build, +and `exampleos/buildmain/x86_64-runtime^^` refers to the one before that. ## The summary file |