Trusted, Bureaucrats
1,382
edits
Changes
Jump to navigation
Jump to search
== Reviewing suggestions and modify commit ==
There were a number of [http://article.gmane.org/gmane.science.nmr.relax.devel/4120 suggestions] to the patches.
=== Squash commits.
[http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html You can squash commits], which essentially take smaller commits and combine them into larger ones. This can be useful if you’re are wrapping up the day’s work of code. Then you can also prepare a better commit message.
First get an overview, over which commits should be squashed
git log
Let's say you wan't to squash the last 6 commits
git rebase -i HEAD~6
In the pop-up editor, replace all '''pick''' with '''s''' or '''squash'''. Save and exit editor.<br>
Then make a commit
git commit
== See also ==
