[vtk-developers] RE Stupid git question #2

[Denis Barbier]

On 2010/4/28 Biddiscombe, John A. wrote:
[...]
> If I have a working branch and I commit every day, that’s ok, but when I merge these daily changes into a published branch, either my “PublishedWork” or “KitwareMaster” – then I want the log to show a single commit with “Lovely feature X added” and not the daily mini-commits.
>
> From my tests so far, when I merge branches, all those mini-commit logs are carried over and you see them in the “PublishedWork” local master/whatever branch. Am I wrong here?
[...]

You can run "git merge --squash mywork" followed by "git commit".
An alternative is to run "git rebase -i" and squash all commits into a
single one, see
   http://www.kernel.org/pub/software/scm/git/docs/git-rebase.html#_interactive_mode

Denis