From: Steve French <smfrench@gmail.com>
Date: Sun, 11 May 2008 16:42:00 GMT
Subject: Re: CIFS fixes
Message-ID: <524f69650805110942k7ccb065bm2c1e60f1a509af5a@mail.gmail.com>
In-Reply-To: <alpine.LFD.1.10.0805090810390.3142@woody.linux-foundation.org>

I am puzzled why I see multiple messages like:

Merge branch 'master' of /.../torvalds/linux-2.6

when using:

git-request-pull origin
git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git

I only pulled once (the initial pull after your previous merge of
cifs-2.6.git tree, but before I added more patches).

On Fri, May 9, 2008 at 10:12 AM, Linus Torvalds
<torvalds@linux-foundation.org> wrote:
>
>
>  On Thu, 8 May 2008, Steve French wrote:
>  >
>  > are available in the git repository at:
>  >
>  >   git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git master
>
>  Ugh. Lots of just merging my code back (a third of all the commits were
>  just merges). Were there really conflicts going on that required that? It
>  makes the history harder to read..
>
>  But pulled.
>
>                 Linus
>



-- 
Thanks,

Steve