On 3 July 2014 12:21, Salz, Rich <rs...@akamai.com> wrote: > Thanks for the explanation. > > Which are the currently active branches?
OpenSSL_0_9_8-stable OpenSSL_1_0_0-stable OpenSSL_1_0_1-stable OpenSSL_1_0_2-stable master > > -- > Principal Security Engineer > Akamai Technologies, Cambridge, MA > IM: rs...@jabber.me; Twitter: RichSalz > > >> -----Original Message----- >> From: owner-openssl-...@openssl.org [mailto:owner-openssl- >> d...@openssl.org] On Behalf Of Ben Laurie >> Sent: Thursday, July 03, 2014 7:15 AM >> To: OpenSSL development >> Cc: Jeffrey Walton >> Subject: Re: [openssl.org #3277] OpenSSL s_client doc missing option >> >> On 3 July 2014 12:04, Salz, Rich <rs...@akamai.com> wrote: >> >> Looks to me like you've only fixed this (and many others) in master - >> >> surely should also go to 1.0.2 at least (and probably older branches, >> >> too)? >> > >> > Okay, tell me which branches. >> >> Since this is a bug, all active branches (that it applies to - not sure if >> this option >> exists in all branches). >> >> >> Also, we generally rebase rather than merge... >> > >> > I don't know the difference. But okay, if that's the practice, I'll >> > figure it out. Everything I've seen said the git model is >> > branch/merge, so I just used the obvious command. :) >> >> Rebasing replays your work on top of the current head of branch. >> There's been a lot of debate, but it seems the team prefer rebasing to >> merging because merging makes diffing/binary chopping harder. >> >> We should write this up somewhere, because rebase + merge also makes >> sense when you're importing someone else's patches (otherwise you tend >> to lose who did the import). >> __________________________________________________________ >> ____________ >> OpenSSL Project http://www.openssl.org >> Development Mailing List openssl-dev@openssl.org >> Automated List Manager majord...@openssl.org ______________________________________________________________________ OpenSSL Project http://www.openssl.org Development Mailing List openssl-dev@openssl.org Automated List Manager majord...@openssl.org
