From: Christoph Hellwig <hch@infradead.org>
To: Dave Chinner <david@fromorbit.com>
Cc: xfs@oss.sgi.com, Alex Elder <aelder@sgi.com>
Subject: Re: XFS Master Branch Rebase
Date: Wed, 28 Jul 2010 04:44:00 -0400 [thread overview]
Message-ID: <20100728084400.GA9516@infradead.org> (raw)
In-Reply-To: <20100727232719.GR7362@dastard>
On Wed, Jul 28, 2010 at 09:27:19AM +1000, Dave Chinner wrote:
> Alex, this is a bit annoying. Rebases are a real pain for anyone
> downstream that is using git in non-trivial ways.
FYI: I asked Alex to do it, so I'll happily take all the blaim here.
The real problem is that we had quite a merge mess before, which Linus
absolutely doesn't like. And if I traced it back correctly most of
it actually came from the xfsdev tree.
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2010-07-28 8:41 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-27 16:16 XFS Master Branch Rebase Alex Elder
2010-07-27 23:27 ` Dave Chinner
2010-07-28 8:44 ` Christoph Hellwig [this message]
2010-07-28 11:09 ` Dave Chinner
2010-07-28 11:19 ` Christoph Hellwig
2010-07-28 16:18 ` Alex Elder
2010-07-28 16:43 ` Alex Elder
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=20100728084400.GA9516@infradead.org \
--to=hch@infradead.org \
--cc=aelder@sgi.com \
--cc=david@fromorbit.com \
--cc=xfs@oss.sgi.com \
/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