| 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: <AANLkTikiy+hNgG=BRWKkHEHCdvJnffWP6nhp1XxsEEO+@mail.gmail.com> Date: Fri, 11 Mar 2011 10:40:23 +1000 From: Dave Airlie <airlied@...il.com> To: Linus Torvalds <torvalds@...ux-foundation.org> Cc: David Miller <davem@...emloft.net>, akpm@...ux-foundation.org, netdev@...r.kernel.org, linux-kernel@...r.kernel.org Subject: Re: [GIT] Networking On Fri, Mar 11, 2011 at 10:34 AM, Linus Torvalds <torvalds@...ux-foundation.org> wrote: > On Thu, Mar 10, 2011 at 4:29 PM, Linus Torvalds > <torvalds@...ux-foundation.org> wrote: >> >> Oh well. Water under the bridge. I think I'll try --no-ff this once, >> despite my misgivings about the concept. > > Oh wow. That really does end up looking odd. I know some other git > projects use --no-ff, but I don't think we've ever had them in the > kernel, and I've never see the graph look like that before. > > But it did allow me to add an explanation for what happened, so maybe > it's worth it. I didn't realise we weren't meant to --no-ff, I've been lately using --no-ff --log so I can keep track of what I merged easier, when someone bases something on my tree and I haven't moved it in a while. Though I suppose author/committer info should tell me this I've found having the logs at least a bit useful. Dave. -- 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