[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <alpine.LFD.2.00.0812310935080.5086@localhost.localdomain>
Date: Wed, 31 Dec 2008 09:41:59 -0800 (PST)
From: Linus Torvalds <torvalds@...ux-foundation.org>
To: Al Viro <viro@...IV.linux.org.uk>
cc: linux-kernel@...r.kernel.org
Subject: Re: [git pull] vfs patches, part 1
On Wed, 31 Dec 2008, Linus Torvalds wrote:
>
> I pulled it, but after looking at it, I unpulled it again. It really is
> every single commit that is broken.
Btw, I can re-pull and just do a rebase and fix things up by hand myself,
so if you don't want to, I can clean up this sequence myself. But I just
don't want it to become a habit, so I want to make sure that at least in
the future these things won't look as horrible.
In case you wonder what the easiest way to fix things up is: just export
the series as a mbox ("git log -p --stat --pretty=email linus.. > mbox")
and then just edit the single mbox file to remove crud. Then you can
re-apply it with "git am".
Of course, with git you can do it in a million different ways: You could
do it with "git format-patch" or with "git rebase -i" too, for example,
but exporting it as an mbox means that you can do it in one single editing
session, which is how at least I personally work. Much nicer than having
to handle each commit individually.
Linus
--
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