From 5943422cf50163acc42f222905222ec21bab7980 Mon Sep 17 00:00:00 2001 From: Jonas Jenwald Date: Tue, 12 Nov 2013 02:32:19 -0800 Subject: [PATCH] Revert 1fea66f2e27d2d067117c18f4ad9834cecc1c204 ... 4da254e29495f05da5aa4c097004c1cd5abb7f18 on Squashing Commits --- Squashing-Commits.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Squashing-Commits.md b/Squashing-Commits.md index 17f7d7d..926dd86 100644 --- a/Squashing-Commits.md +++ b/Squashing-Commits.md @@ -38,4 +38,5 @@ git push --force origin super-feature 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 -``` \ No newline at end of file +``` +Change `pick` to `squash` for last four and update the commit message in the editor.