Yaroslav Halchenko <debian@xxxxxxxxxxxxxx> writes: > On Mon, 13 Dec 2010, Junio C Hamano wrote: >> would make sense only if used with --no-commit. > >> But for such a use case, "git read-tree -m -u 0.2" would work just as >> well, and discussion ended there ;-) > > hm -- read-tree sounded like yet another unknown to me feature of GIT I > was trying desperately to discover ;) unfortunately it doesn't produce a merge > for me Didn't I already say it makes sense only with --no-commit? IOW to shape the tree. And in your use case I do not think you would even want to have a merge. Even if you run "git rm" to remove non-free stuff from the merge result, if you merged the history of 0.2 that contains non-free stuff you are not allowed to distribute (forbidden either by upstream or self-imposed dfsg, the reason does not matter), people who gets the merge commit can follow its second parent to grab the non-free stuff, no? -- 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