On Fri, Sep 07, 2007 at 12:13:23PM +0200, Lars Hjemli wrote: > 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...] > Sorry, I wasn't aware of that. I had a 'subscribe git@xxxxxxxxxxxxxxx' in my muttrc and just pressed 'g' for group reply. Reading the docs suggested to 'set followup_to=no' (as I did before sending this message). Per default it is set to 'yes'. Could anyone more experienced with mutt correct me if this was the wrong fix for this problem (or even point me to the right documentation)? -Peter - 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
