Git: simplest way of squashing commits on master
Possible Duplicate:
How can I squash my last X commits together using git?
I have a project hosted on GitHub and I have a local clone. I have a load of small commits that I have already pushed up to GitHub. This has all been done using the default *master branch.
I got confused between merge --squash and rebase etc... What is the most straightforward way of combining several historial commits in to one commit so that it pushes up to GitHub?
Before starting, you should make sure that git status is clean (ie there's no output from that command) to avoid losing work. The simplest way to do what you want is probably:
git reset --soft <LAST-COMMIT-THAT'S-OK>
git commit -m 'Many squashed commits'
git push --force origin master
You should bear in mind that this is rewriting history (that's why you need the --force option to git push ) so you should avoid this if anyone else might have cloned or pulled from your repository. For some more alternatives, see this question and its answers:
上一篇: git squash last n提交时没有交互式rebase
下一篇: Git：最简单的压缩方法是对主人提交