Avery Pennarun <apenwarr@xxxxxxxxx> writes: > And the "'merge --squash' and don't commit the changes you don't want" > option looks okay to me too. Whatever you do to prepare the tree contents to suit the desire of the original request, I think it is essential not to record the result of such an operation as a merge (because it is not, and it will screw up later merges). Use of "merge --squash" in this thread is a very good suggestion. Good job. -- 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