Reword the Git Hints a bit

day2/05_Git_Hints/01_Intro.md

@@ -4,11 +4,13 @@
 !SLIDE smbullets
 # Best Practices
 
-* Ensure to set user configuration (name, email)
+* Set user configuration (name, email)
 * Always keep good commits in mind
-* Do not commit all changes at once
-* Work with branches if applicable
-* Avoid merge commits, fetch and rebase your history
+* Do not commit all changes at once - use staging with `git add` and then `git commit`
+
+* Work with branches (features, bugfixes, etc.) whenever possible
+* Rebase branches against master prior to merging a merge request
+* Always force a merge commit with `--no-ff` to keep history trees in graphs
 
 ~~~SECTION:handouts~~~