Hi Linus,
On Tue, 1 May 2012 19:58:46 -0700 Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> 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@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpITszlKUDEI.pgp
Description: PGP signature