Compare commits

..

No commits in common. "5184b4483fc57f64af9fd0d08487a37d1182f52d" and "94500a6e392683d5400d232dff15b08dd989e622" have entirely different histories.

2 changed files with 4 additions and 7 deletions

View File

@ -24,12 +24,9 @@ git diff dev...master # look at the set of changes which exist in master but no
If the last command has no output, congrats, there is nothing to do. If the last command has output, then you should merge master into dev:
```
git checkout master
git merge --no-ff dev # using the default commit message is fine
git push origin master
git checkout dev
git merge master
git push origin dev
git merge --no-ff master # using the default commit message is fine
git push
```
The `--no-ff` flag above makes sure to make a merge commit, no matter what, even if a "fast forward" could be done. For those in the future looking back, it's much better to see evidence of when branches were merged.

View File

@ -10,10 +10,10 @@ and no longer on Github, since they banned Duke Leto and
also because they censor many people around the world and work with
evil organizations.
# Hush 3.9.3 "Lateral Larvacean"
# Hush 3.9.3 "XXX"
```
1012 files changed, 36253 insertions(+), 5507 deletions(-)
...
```
This is an OPTIONAL release. It is recommended for exchanges, solo miners and mining pools to update to this release.