From 74bd4c34a8bdfcb45f7a7265f46e4b362a2c6e32 Mon Sep 17 00:00:00 2001 From: yurydelendik Date: Thu, 4 Oct 2012 08:50:55 -0700 Subject: [PATCH] Updated Squashing Commits (markdown) --- Squashing-Commits.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Squashing-Commits.md b/Squashing-Commits.md index 129aa00..f3df6b0 100644 --- a/Squashing-Commits.md +++ b/Squashing-Commits.md @@ -31,8 +31,8 @@ git checkout -B super-feature git commit -e ``` -1. Or, you can use rebase. Let's say you have 5 commits to merge and you don't have merge commits: +1. Or, you can use rebase. Let's say you have 5 commits to squash and you don't have merge commits: ``` git rebase -i HEAD~5 ``` -Change `pick` to `squash` for last four and update the commit message. +Change `pick` to `squash` for last four and update the commit message in the editor.