gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-20 15:19:01 +02:00
Code Issues Actions 19 Packages Projects Releases Wiki Activity

chore(rebrand): change references from master to main

Browse Source
This commit is contained in:
Elian Doran 2025-06-21 17:51:34 +03:00
parent 24ba17b3f3
commit f497b71d37
No known key found for this signature in database
5 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/playwright.yml vendored
View File

@ -3,7 +3,7 @@ name: playwright
on: on:
push: push:
branches: branches:
- master - main
pull_request: pull_request:
permissions: permissions:

2
_regroup/bin/release-flatpack.sh
View File

@ -24,7 +24,7 @@ if ! git diff-index --quiet HEAD --; then
exit 1 exit 1
fi fi
BASE_BRANCH=master BASE_BRANCH=main
if [[ "$VERSION" == *"beta"* ]]; then if [[ "$VERSION" == *"beta"* ]]; then
BASE_BRANCH=beta BASE_BRANCH=beta

8
_regroup/bin/release.sh
View File

@ -47,11 +47,3 @@ echo "Tagging commit with $TAG"
git tag $TAG git tag $TAG
git push origin $TAG git push origin $TAG
echo "Updating master"
git fetch
git checkout master
git reset --hard origin/master
git merge origin/develop
git push

2
apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Manually.html generated vendored
View File

@ -20,7 +20,7 @@
<h2>Installation</h2> <h2>Installation</h2>
<h3>Download</h3> <h3>Download</h3>
<p>You can either download source code zip/tar from <a href="https://github.com/TriliumNext/Notes/releases/latest">https://github.com/TriliumNext/Notes/releases/latest</a>.</p> <p>You can either download source code zip/tar from <a href="https://github.com/TriliumNext/Notes/releases/latest">https://github.com/TriliumNext/Notes/releases/latest</a>.</p>
<p>For the latest version including betas, clone Git repository <strong>from</strong> <code>master</code> <strong>branch</strong> with:</p><pre><code class="language-text-x-trilium-auto">git clone -b master https://github.com/triliumnext/notes.git</code></pre> <p>For the latest version including betas, clone Git repository <strong>from</strong> <code>main</code> <strong>branch</strong> with:</p><pre><code class="language-text-x-trilium-auto">git clone -b main https://github.com/triliumnext/notes.git</code></pre>
<h2>Installation</h2><pre><code class="language-text-x-trilium-auto">cd trilium <h2>Installation</h2><pre><code class="language-text-x-trilium-auto">cd trilium
# download all node dependencies # download all node dependencies

4
docs/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Manually.md vendored
View File

@ -28,10 +28,10 @@ sudo apt install libpng16-16 libpng-dev pkg-config autoconf libtool build-essent
You can either download source code zip/tar from [https://github.com/TriliumNext/Notes/releases/latest](https://github.com/TriliumNext/Notes/releases/latest). You can either download source code zip/tar from [https://github.com/TriliumNext/Notes/releases/latest](https://github.com/TriliumNext/Notes/releases/latest).
For the latest version including betas, clone Git repository **from** `master` **branch** with: For the latest version including betas, clone Git repository **from** `main` **branch** with:
``` ```
git clone -b master https://github.com/triliumnext/notes.git git clone -b main https://github.com/triliumnext/notes.git
``` ```
## Installation ## Installation