diff options
author | yude <yudesleepy@gmail.com> | 2021-01-04 18:51:10 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-04 18:51:10 +0900 |
commit | e6754f2154a79abd8e5e64bd923f6984aa9ad44b (patch) | |
tree | f074119530bb59ef155938ea367f719f1e4b70f1 /doc/md/dev/Release-Shaarli.md | |
parent | 5256b4287021342a9f8868967b2a77e481314331 (diff) | |
parent | ed4ee8f0297941ac83300389b7de6a293312d20e (diff) | |
download | Shaarli-e6754f2154a79abd8e5e64bd923f6984aa9ad44b.tar.gz Shaarli-e6754f2154a79abd8e5e64bd923f6984aa9ad44b.tar.zst Shaarli-e6754f2154a79abd8e5e64bd923f6984aa9ad44b.zip |
Merge pull request #2 from shaarli/master
Merge fork source
Diffstat (limited to 'doc/md/dev/Release-Shaarli.md')
-rw-r--r-- | doc/md/dev/Release-Shaarli.md | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/doc/md/dev/Release-Shaarli.md b/doc/md/dev/Release-Shaarli.md index 2c772406..d79be9ce 100644 --- a/doc/md/dev/Release-Shaarli.md +++ b/doc/md/dev/Release-Shaarli.md | |||
@@ -64,6 +64,14 @@ git pull upstream master | |||
64 | 64 | ||
65 | # If releasing a new minor version, create a release branch | 65 | # If releasing a new minor version, create a release branch |
66 | $ git checkout -b v0.x | 66 | $ git checkout -b v0.x |
67 | # Otherwise just use the existing one | ||
68 | $ git checkout v0.x | ||
69 | |||
70 | # Get the latest changes | ||
71 | $ git merge master | ||
72 | |||
73 | # Check that everything went fine: | ||
74 | $ make test | ||
67 | 75 | ||
68 | # Bump shaarli_version.php from dev to 0.x.0, **without the v** | 76 | # Bump shaarli_version.php from dev to 0.x.0, **without the v** |
69 | $ vim shaarli_version.php | 77 | $ vim shaarli_version.php |