|
From: | Paolo Bonzini |
Subject: | Re: [committed] gettext should require threadlib.m4 |
Date: | Thu, 21 Aug 2008 11:43:48 +0200 |
User-agent: | Thunderbird 2.0.0.16 (Macintosh/20080707) |
Ralf Wildenhues wrote:
Hi Paolo, * Paolo Bonzini wrote on Thu, Aug 21, 2008 at 11:32:16AM CEST:And I committed a merge in the meanwhile. Sorry; I'll prepare a patch to git to disable merges on branches where you do not want them. :-)I committed this patch as it is pretty obvious.This: [branch "master"] rebase = true in your git config, is quite helpful, in order to let 'pull' rebase by default.
Thanks for the tip (I didn't know about it) but it won't fully help. In this case, I would not have committed a merge, but I would have anyway committed the poll(2) work in progress.
My usual workflow is to develop stuff in a separate branch, and I want to catch as soon as possible any deviation from the workflow.
Paolo
[Prev in Thread] | Current Thread | [Next in Thread] |