Re: What's cooking in git.git (Apr 2014, #08; Fri, 25)

2014-04-25 Thread Alex Davidson
On Fri, 2014-04-25 at 20:36 -0500, Felipe Contreras wrote: > Jeff King wrote: > > If you are waiting on me, I do not have much else to say on this topic. > > @{publish} as specified by Felipe is not useful to me, and I would > > continue to pursue @{push} separately as "the remote-tracking branch o

Re: cherry picking and merge

2014-08-01 Thread Alex Davidson
On Fri, 2014-08-01 at 18:40 -0500, Nico Williams wrote: > On Fri, Aug 1, 2014 at 6:06 PM, Mike Stump wrote: > > On Aug 1, 2014, at 1:12 PM, Sam Vilain wrote: > >> Git merge has a notion of discrete "merge strategies”. > > > >> There's no particular reason that you couldn't implement a merge > >>