DragonX/hush3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Explain git-fu in reldocs

Browse Source
This commit is contained in:
Jonathan "Duke" Leto
2022-09-27 05:02:46 -07:00
parent f792488328
commit 9cf440ae2d
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
doc/release-process.md
View File

@@ -92,8 +92,9 @@ Install deps on Linux:
- To get the stats of file changes: `git diff --stat master...dev`
- Do a fresh clone and fresh sync with new checkpoints
- Stop node, wait 20 minutes, and then do a partial sync with new checkpoints
- Merge dev into master: `git checkout master; git pull && git merge --no-ff dev`
- Merge dev into master: `git checkout master; git pull && git merge --no-ff dev && git push`
- The above command will not merge if "git pull" creates a merge conflict
- The above command will not push if there is a problem with merging dev
- Make Gitea release with git tag from master branch (make sure to merge dev in first)
- Use util/gen-linux-binary-release.sh to make a Linux release binary
- Use util/build-debian-package.sh to make an x86 Debian package for the release