From 1fea66f2e27d2d067117c18f4ad9834cecc1c204 Mon Sep 17 00:00:00 2001 From: Tim van der Meij Date: Tue, 16 Jul 2013 06:56:19 -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 7d63375..926dd86 100644 --- a/Squashing-Commits.md +++ b/Squashing-Commits.md @@ -21,7 +21,7 @@ git push --force origin super-feature ## Alternatives 1. Step-by-step commands ``` -# fetch the current upstream repository +# fetches the current upstream repository git fetch upstream # resets HEAD to the current upstream git checkout upstream/master @@ -31,7 +31,7 @@ git merge --no-commit --squash super-feature git checkout -B super-feature # lets you edit the commit and checks in the changes (you can also use git commit -m "message") git commit -e -# push the changes (in general, be careful with the --force parameter) +# pushes the changes (in general, be careful with the --force parameter) git push --force origin super-feature ```