Cory Sharp <cory.sharp@xxxxxxxxx> writes: > On Wed, May 13, 2009 at 8:21 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > .. >> Of course. That's the whole point of recording a merge as a merge. >> > > $ git help merge > > --squash > Produce the working tree and index state as if a real merge > happened. ... This allows you to create a > single commit on top of the current branch whose effect is > the same as merging another branch. What's your point? WIth --squash, the tree and the index state becomes the same as if a real merge happened. But the merge history is discarded with --squash. It is a simulation of a merge in CVS and SVN (before they added "merge tracking"). If you want support for repeated merges by merge tracking, you do not want todiscard the merge history by using --squash. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html