From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 02 May 2012 03:30:23 GMT
Subject: Re: [PATCH 0/2] [GIT PULL] ktest: A couple of fixes
Message-ID: <20120502133023.07e16a8681b8924afc47e4e0@canb.auug.org.au>
In-Reply-To: <CA+55aFy02d13HkfwY-TEGwu=2cd8en+_rnrnwcwixGKRmdJRtA@mail.gmail.com>

Hi Linus,

On Tue, 1 May 2012 19:58:46 -0700 Linus Torvalds <torvalds@linux-foundation.org> wrote:
>
> The sad part is that I don't think you can even override the second
> case. IOW, I think even "git pull --ff linus v3.4-rc5" will still do a
> non-fast-forward merge.

git merge v3.4-rc5^{commit}

works, but that doesn't work for "git pull" :-(  I tend to "fetch and
merge" rather than pull ...

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/