| 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
| ||
|
Message-ID: <20130312132510.GH18595@thunk.org> Date: Tue, 12 Mar 2013 09:25:10 -0400 From: Theodore Ts'o <tytso@....edu> To: Stephen Rothwell <sfr@...b.auug.org.au> Cc: James Morris <jmorris@...ei.org>, Linus <torvalds@...ux-foundation.org>, linux-next@...r.kernel.org, linux-kernel@...r.kernel.org Subject: Re: linux-next: unneeded merge in the security tree On Tue, Mar 12, 2013 at 04:18:23PM +1100, Stephen Rothwell wrote: > Well, you used to be able to merge a tag and it would just fast forward > if possible. That was changed (for good reason), but now gives us this > outcome. Also, "git merge --ff" does not override that behaviour, but > "git merge --ff-only" does. Also, of course, if (say) origin/master had > been v3.9-rc2, then "git merge origin/master" would have also just done a > fast forward. I'm probably old school (or maybe wacky school --- who knows :-), but what I usually do is something like this: git branch -a --contains HEAD # make sure the HEAD pointer is git tag --contains HEAD # include where I think it should be git reset --hard v3.9-rc2 Yeah, it's more key strokes than "git merge --ff-only v3.9-rc2", but I can type the above faster because they're finger macros for me. :-) - Ted -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists