From: Linus Torvalds <torvalds@linux-foundation.org>
To: Al Viro <viro@ZenIV.linux.org.uk>
Cc: linux-kernel@vger.kernel.org
Subject: Re: [git pull] vfs patches, part 1
Date: Wed, 31 Dec 2008 09:41:59 -0800 (PST) [thread overview]
Message-ID: <alpine.LFD.2.00.0812310935080.5086@localhost.localdomain> (raw)
In-Reply-To: <alpine.LFD.2.00.0812310905580.5086@localhost.localdomain>
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
next prev parent reply other threads:[~2008-12-31 17:42 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-31 7:43 [git pull] vfs patches, part 1 Al Viro
2008-12-31 17:21 ` Linus Torvalds
2008-12-31 17:31 ` Linus Torvalds
2008-12-31 17:41 ` Linus Torvalds [this message]
2008-12-31 20:43 ` Junio C Hamano
2008-12-31 23:10 ` Al Viro
2009-01-01 0:05 ` Linus Torvalds
-- strict thread matches above, loose matches on Subject: below --
2009-06-12 1:45 Al Viro
2009-06-12 3:13 ` Linus Torvalds
2009-06-12 3:38 ` Al Viro
2009-06-16 16:19 ` hooanon05
2009-06-16 17:31 ` Al Viro
2009-06-18 14:30 ` hooanon05
2009-06-20 0:29 ` Linus Torvalds
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.LFD.2.00.0812310935080.5086@localhost.localdomain \
--to=torvalds@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=viro@ZenIV.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox