mirror of
https://git.hush.is/hush/hush3.git
synced 2025-07-14 00:03:21 -04:00
Compare commits
6 Commits
94500a6e39
...
5184b4483f
Author | SHA1 | Date | |
---|---|---|---|
|
5184b4483f | ||
|
f271e60e58 | ||
|
4a2361cdf6 | ||
|
bec27a85e5 | ||
|
65b9e74333 | ||
|
7bbc291370 |
@ -24,9 +24,12 @@ 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:
|
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 checkout dev
|
||||||
git merge --no-ff master # using the default commit message is fine
|
git merge master
|
||||||
git push
|
git push origin dev
|
||||||
```
|
```
|
||||||
|
|
||||||
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.
|
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.
|
||||||
|
@ -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
|
also because they censor many people around the world and work with
|
||||||
evil organizations.
|
evil organizations.
|
||||||
|
|
||||||
# Hush 3.9.3 "XXX"
|
# Hush 3.9.3 "Lateral Larvacean"
|
||||||
|
|
||||||
```
|
```
|
||||||
...
|
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.
|
This is an OPTIONAL release. It is recommended for exchanges, solo miners and mining pools to update to this release.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user