On Thu, May 14, 2009 at 12:01 AM, Michael Radziej <mir@xxxxxxxx> wrote: > git merge --squash is not a merge at all. ... > It is useful only in very special circumstances. You're right. I (incorrectly) thought I had to use --squash to properly interface with an svn branch and trunk through git-svn. I thought not using squash would trigger hundreds of commits - it doesn't, nice things happen with just "merge". Thanks everyone for helping me, Cory -- 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