Ack. I'll take another look at that.
On Tue, Apr 24, 2012 at 12:48 PM, Dustin <dsalli...@gmail.com> wrote: > > On Monday, April 23, 2012 4:20:15 PM UTC-7, Aaron Stone wrote: >> >> > It also didn't "do" anything; no commits resulted from running that >> > command. >> >> If the engine merge branch actually has all relevant code from master, >> could we begin releasing memcached 1.4 versions from a memcached14 >> branch, and merge engine to master? > > Sorry I've been a bit unavailable lately and hadn't had a chance to figure > out what was going wrong here. I had some personal stuff come up that's > kept me from being useful to society. > > I guess I don't understand git cherry, or at least does something way > different from what log suggests: > > % git shortlog -sne ..core/master > 27 dormando <dorma...@rydia.net> > 7 Dustin Sallings <dus...@spy.net> > 1 Steve Wills <st...@mouf.net> > % git cherry master | wc -l > 443 > > Those 35 changes still need to go in. I've just been using "git log" itself > to facilitate the merges. I think if you replaced cherry with log and went > through those, it'd do what's expected here.
