> Hi, > > I really love the fact I can micro-commit changes when I'm > developing. However at some point the combination of changes > I have made can be considered a single body of work. This is > especially true when you start doing things like re-basing on > code that has moved around a lot. You don't want to be > correcting a whole bunch of merge failures for every commit > in your current tree. > > So far the only was I can see to do this is a: > > git-diff master..HEAD > my.patch > > And then re-applying your patch in stages, manually doing the commits. > > Am I missing something? git merge --squash ? -- best regards Ray - 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
