linux-kernel - Re: [PATCH 0/2] [GIT PULL] ktest: A couple of fixes

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Wed, 2 May 2012 13:30:23 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Linus Torvalds <torvalds@...ux-foundation.org>
Cc:	Steven Rostedt <rostedt@...dmis.org>, linux-kernel@...r.kernel.org,
	Junio C Hamano <gitster@...ox.com>,
	Git Mailing List <git@...r.kernel.org>
Subject: Re: [PATCH 0/2] [GIT PULL] ktest: A couple of fixes

Hi Linus,

On Tue, 1 May 2012 19:58:46 -0700 Linus Torvalds <torvalds@...ux-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@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped