Squashing instructions extended

Tim van der Meij 2013-07-16 06:55:40 -07:00
parent 3320a009b6
commit 9b189ed245

@ -21,14 +21,18 @@ git push --force origin super-feature
## Alternatives
1. Step-by-step commands
```
# fetch the current upstream repository
git fetch upstream
# resets HEAD to the current upstream
git checkout upstream/master
# merges all commits from the local branch
git merge --no-commit --squash super-feature
# re-creates the branch starting from current HEAD (old commits will be lost)
git checkout -B super-feature
# lets you edit the commit and checks in the changes
# 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)
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: