summaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2017-02-16 12:30:54 +0100
committerJohnny Willemsen <jwillemsen@remedy.nl>2017-02-16 12:30:54 +0100
commitd835f05c179b7e008f9f2708bb579a7b4810bdd4 (patch)
tree5ee0274da41f0008c067c7855b6d0fb49a2a755e /README.md
parent8bf67d79b662b4189dc0213638299afea0f2c2e4 (diff)
downloadATCD-d835f05c179b7e008f9f2708bb579a7b4810bdd4.tar.gz
Different icon
* README.md:
Diffstat (limited to 'README.md')
-rw-r--r--README.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/README.md b/README.md
index 891c083ca0e..726829c4a09 100644
--- a/README.md
+++ b/README.md
@@ -231,7 +231,7 @@ More information on pulling changes from remote, forked repos can be found in [C
* If you see "non-fast-forward updates were rejected" you shall never use "force" on upstream! It means that another patch was merged before you and you have to update your master again, and rebase again.
* "force" is allowed only in special maintenance circumstances. If you find you're needing it to handle a pull request, then you're doing it wrong, and the mistake might be a dangerous one! It's like the good rule of never commit when you're drunk (coding is allowed).
-:x: __Never use force on git push__ Using _-f_ while pushing on a shared repository such as _upstream_ you could effectively erase other committed patches. No-one shall ever use this option unless unanimously approved on the public mailing list: the most dangerous aspect of it is that nobody gets any notification if this happens, and we might think issues are solved but you silently removed the fix and it's history from the repository.
+:red_circle: __Never use force on git push__ Using _-f_ while pushing on a shared repository such as _upstream_ you could effectively erase other committed patches. No-one shall ever use this option unless unanimously approved on the public mailing list: the most dangerous aspect of it is that nobody gets any notification if this happens, and we might think issues are solved but you silently removed the fix and it's history from the repository.
#### Cutting releases