On Thu, Jul 03, 2014 at 07:04:09AM -0400, Salz, Rich 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.
>
> > 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. :)
For cloning commits to a second branch, use "cherry-pick -x".
For cloning a feature branch to a stable branch or master,
$ git co -b feature-rebase feature
$ git rebase -i branch-stable
$ git co branch-stable
$ git merge --ff-only feature-rebase
The last "merge" is a fast-forward of a bunch of commits, not a
true merge of two branches.
--
Viktor.
______________________________________________________________________
OpenSSL Project http://www.openssl.org
Development Mailing List [email protected]
Automated List Manager [email protected]
