Update readme and pre-commit

package.json

@@ -19,6 +19,8 @@
     "remark-preset-lint-recommended": "^3.0.1"
   },
   "remarkConfig": {
-    "plugins": ["remark-preset-lint-recommended"]
+    "plugins": [
+      "remark-preset-lint-recommended"
+    ]
   }
 }

readme.md

@@ -76,12 +76,7 @@ pip install -r requirements.production.txt
 
 ## Development workflow
 
-When pulling changes from the server, use `rebase` instead of `merge` for a nice and clean linear history.
-
-Example of pulling with rebase:
-```
-git pull --rebase
-```
+Do not use `rebase` when pulling or merging changes. Rebasing transforms the commit history and makes it appear more linear. This is a plus e.g. when working with a few people, but in this project traditional merging is recommended for clarity.
 
 When you start working on a feature, create a feature branch for your changes. These feature branches should be prefixed with `feature`.
 

scripts/git/pre-commit

@@ -1,4 +1,10 @@
 set -e
+PURPLE='\033[0;35m'
+NC='\033[0m' # No Color
+
+printf "${PURPLE}Running pre-commit tests.${NC}\n"
 npm test
-python manage.py test
+python manage.py test --noinput
 set +e
+
+printf "${PURPLE}Tests passed.${NC}\n"