On Tue, Oct 23, 2012 at 3:55 PM, Tim Bird <tim.b...@am.sony.com> wrote:
> On 10/23/2012 11:43 AM, Geert Uytterhoeven wrote:
>> On Tue, Oct 23, 2012 at 8:29 PM, Thomas Petazzoni
>> <thomas.petazz...@free-electrons.com> wrote:
>>>> Also, I use 'git format-patch' quite a bit when I'm converting
>>>> from git commits to a quilt series. I know people use this
>>>> for submitting patches to mainline, but I use it a bit differently
>>>> (I think) when I'm making a quilt patch series.
>>>
>>> For sure on my end the most useful git commands are:
>>>
>>> * git rebase -i, which I use to rework series of patches. No need for
>>> quilt, stgit, topgit or who knows what. git rebase -i is really a
>>> very powerful way to organize and rework a set of patches, going
>>> through multiple iterations.
>>
>> Agreed. Once you start using "git rebase -i", you start wondering how you
>> ever could have lived with quilt.
>
> It must just be me. I've tried "git rebase -i" a few times, and I
> always manage to completely mess up my patches. If I hadn't done a git stash,
> I would have been dead. I probably just need to muscle my way through
> it a few more times until I'm comfortable with it, but I must be
> doing something wrong...
Tim,
I'm very newbiew around here, and being new to kernel, I've missed the
quilt age.
That said, "git rebase -i" is one of the most frequent stuff I do when
preparing patchsets...
Note that it's very flexible...
git rebase -i HEAD^
git rebase -i HEAD^^^
git rebase -i ba06efcc4
git rebase -i linuxtv/staging/for_v3.8
Once there you can even reorder commits, bringing some ancient commit to HEAD
and then fix with "git commit --amend".
Of course, I've messed patches a few times, but it's until you get
used to it ;-)
My two cents,
Ezequiel
_______________________________________________
Celinux-dev mailing list
Celinux-dev@lists.celinuxforum.org
https://lists.celinuxforum.org/mailman/listinfo/celinux-dev
