[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1310597043.2586.60.camel@twins>
Date: Thu, 14 Jul 2011 00:44:03 +0200
From: Peter Zijlstra <peterz@...radead.org>
To: Jesper Juhl <jj@...osbits.net>
Cc: Jiri Kosina <jkosina@...e.cz>,
"Jan H." Schönherr <schnhrr@...tu-berlin.de>,
Ingo Molnar <mingo@...e.hu>, linux-kernel@...r.kernel.org
Subject: Re: [PATCH 1/6] sched: Fix (harmless) typo 'CONFG_FAIR_GROUP_SCHED'
On Thu, 2011-07-14 at 00:35 +0200, Jesper Juhl wrote:
>
> Don't know your workflow, but I can tell you what I do. I just have a
> branch for patches that I'm gathering that are not yet in upstream. Apply
> any new stuff there (or cherry-pick from other branches to my queue
> branch) and then regularly rebase that branch on master (Linus' tree).
> When I then want to resend some patches it's as simple as checking out my
> queue branch, doing a rebase to make sure there's no obsolete stuff in it
> and then git format-patch to generate mails for the patches I want to
> re-send and then read those patches in to re-alpine and send them.
> To me that's not very painfull, but of course it may not match your
> workflow - just a description of mine :-) .
Right, so I find cherry-picking and rebasing using git the most painful
thing ever.
Also, using quilt you get a plain text version of the patch you can edit
at your leisure, editing a git patch involves some export, import and
rebase foo which is all too much work.
Furthermore, using quilt I get help from useful tools like rej and meld
git-merge otoh creates these god-awful merge markers that no tool can
deal with.
As for re-alpine, I might actually try it, you're the second one
promoting it. Although I had somewhat hoped for a MUA like sup to become
useful (or notmuch to grow a usable front-end). Traditional MUAs simply
can't seem to cope well with today's number of emails.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists