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.

  • Git - push current branch shortcut
  • Are git submodules the only safe way to have working copies within working copies?
  • Git thinks .ini saved in unicode files are binary
  • Deploying to Heroku using git on bitbucket
  • Undo git reset --hard with uncommitted files in the staging area
  • Test VM in GIT repository
  • 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?

  • Make git ignore the date in PDF files
  • How to include a excluded file in sub directory in Git?
  • Adding GIT support to existing project in IntelliJ IDEA
  • How do I list all the files in git?
  • Git not able to recognise addition of .xcscheme files in xcode project
  • Git install with Aptana
  • One Solution collect form web for “Git: simplest way of squashing commits on master”

    Before starting, you should make sure that git status is clean (i.e. 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:

    • Squash my last X commits together using Git
    Git Baby is a git and github fan, let's start git clone.