seanh <seanh.nospam@xxxxxxxxx> writes: > In response to Matthieu and Paolo, I'm not sure I understand the git > internals involved in the discussion around merge --squash, I had a > feeling this would produce a 'merge' that git in some sense would 'not > know about', Yes, that's it. Git does a merge, and immediately forgets it was a merge. The consequence is when you merge again later, Git will not be able to use the merge information to be clever about merging. Somehow, Git will be as bad as SVN for merging if you don't know what you're doing ;-). > since it sounds complex and I don't understand it I don't think I > want to go there. Well, it's fun also to learn Git notions in more details ;-). -- Matthieu -- 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