--squash git merge git 1.4.1 . , . , 143eff , , master " " dcb7e5, :
$ git checkout master
$ git branch old-master
$ git checkout -b new-master 143eff
$ git merge
Updating 143eff3..dcb7e5b
Fast-forward
Squash commit
[... status output showing the staged changes ..]
$ git commit -m "A commit squashing history up to a month ago"
git diff dcb7e5 new-master, .
:
$ git rebase --onto new-master dcb7e5 master
rebased master, . ( , git diff old-master master git log. github --force, :
$ git push --force origin master
new-master, squash commit, :
git branch -d new-master
, github git gc --auto , ...