Use the term "squash" when referring to collapsing commits into one (#…

…1011) That's consistent with the term used in git-rebase and with the general public.
mainmatter · Jun 24, 2016 · fd83b92 · fd83b92
1 parent 21e638f
commit fd83b92
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -33,7 +33,7 @@ Here's a few steps to follow to make sure your pull request gets accepted:
 3. Adhere to Ember Simple Auth's coding style; while there's no official style
   guide it should be clear by looking at the existing code what the agreed upon
   rules are.
-4. Stash all your commits into one before submitting the pull request so it's
+4. Squash all of your commits into one before submitting the pull request so it's
   easier to review them.
 5. Provide a good description for your pull request - what does it add, why is
   that needed etc.?