From: Kalle Valo <kalle.valo@nokia.com>
To: "John W. Linville" <linville@tuxdriver.com>
Cc: Zhu Yi <yi.zhu@intel.com>, linux-wireless@vger.kernel.org
Subject: Re: wireless-testing rebased again?
Date: Tue, 09 Sep 2008 08:47:34 +0300 [thread overview]
Message-ID: <873ak9hnux.fsf@nokia.com> (raw)
In-Reply-To: <20080908142117.GA24557@tuxdriver.com> (ext John W. Linville's message of "Mon\, 8 Sep 2008 10\:21\:17 -0400")
John W. Linville <linville@tuxdriver.com> writes:
> On Mon, Sep 08, 2008 at 03:24:58PM +0800, Zhu Yi wrote:
>
>> I find the wireless-testing GIT has been rebased twice in less than one
>> month. Does it mean you give up making it a long lived merge-able tree?
>> This may affect to the downstream wireless drivers code management. At
>> least for iwlwifi, we'd expect to merge with wireless-testing everytime.
>
> There must be some mistake, it has not been rebased at all -- at
> least not as far as git is concerned. I have done my now customary
> "revert everything, pull from Linus re-apply" thing that I call a
> virtual rebase, but the history has remained continuous.
>
> The non-master branches do get rebased of course. Perhaps you saw
> that and thought that master had been rebased as well?
FWIW, I also have had conflicts while pulling wireless-testing#master
and I similarly thought that you have rebased it. But if you didn't I
don't know what happened.
--
Kalle Valo
next prev parent reply other threads:[~2008-09-09 5:48 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-08 7:24 wireless-testing rebased again? Zhu Yi
2008-09-08 14:21 ` John W. Linville
2008-09-09 5:47 ` Kalle Valo [this message]
2008-09-09 14:05 ` John W. Linville
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=873ak9hnux.fsf@nokia.com \
--to=kalle.valo@nokia.com \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=yi.zhu@intel.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;
as well as URLs for NNTP newsgroup(s).