Updated Squashing Commits (markdown)

2012-10-04 08:50:14 -07:00 · 2012-10-04 08:50:14 -07:00 · e6c15ce1bd
commit e6c15ce1bd
parent 48b75dc3e8
1 changed files with 1 additions and 1 deletions
--- a/Squashing-Commits.md
+++ b/Squashing-Commits.md
@ -31,7 +31,7 @@ git checkout -B super-feature
 git commit -e
 ```

-1. Or, you can use rebase. Let's say you have 5 commits to merge:
+1. Or, you can use rebase. Let's say you have 5 commits to merge and you don't have merge commits:
 ```
 git rebase -i HEAD~5
 ```