Merge pull request #90 from StephenCoady/git-additions

some git collaboration commands

git-tricks.md

@@ -28,6 +28,15 @@ category: Git
     # delete remote branch
       git push origin :$branchname
       
+## Collaboration
+
+    # Rebase your changes on top of the remote master
+      git pull --rebase upstream master
+      
+    # Squash multiple commits into one for a cleaner git log
+    # (on the following screen change the word pick to either 'f' or 's')
+      git rebase -i $commit_ref
+
 Submodules
 ----------