On 9/7/07, Peter Baumann <waste.manager@xxxxxx> wrote: > lets reset 'trunk' to its state before the merge and > 'branch1' to the merge commit, before fixing the bug in 'branch1'. > > a-b-c-d-e trunk > \ \ > \ -x-y m branch1 Yeah, this would certainly not be handled correctly by dcommit using --first-parent (but it could be handled by (a correct implementation of) --upstream). Thanks for the example, I had a feeling something like this could occur. So I guess I'll have another go at --upstream this weekend. [btw: could you please stop messing with 'Mail-Followup-To:'? When replying to your mail, I don't want everyone _except_ you in the 'To:' header...] -- larsh - 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
