From e6c15ce1bd684a6bd143b9248ea4880240bf8f7d Mon Sep 17 00:00:00 2001 From: yurydelendik Date: Thu, 4 Oct 2012 08:50:14 -0700 Subject: [PATCH] Updated Squashing Commits (markdown) --- Squashing-Commits.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Squashing-Commits.md b/Squashing-Commits.md index 0e1addf..129aa00 100644 --- 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 ```