Re: [PATCH v2 0/9] Introduce publish tracking branch

2014-04-11 Thread Felipe Contreras
Matthieu Moy wrote: > Felipe Contreras writes: > > > My patch series only affects push.default=simple, perhaps you have a > > different configuration. > > Good catch. I have push.default=upstream (essentially for compatibility > with old Git versions, I'd prefer simple actually). > > > Maybe we

Re: [PATCH v2 0/9] Introduce publish tracking branch

2014-04-11 Thread Matthieu Moy
Felipe Contreras writes: > My patch series only affects push.default=simple, perhaps you have a > different configuration. Good catch. I have push.default=upstream (essentially for compatibility with old Git versions, I'd prefer simple actually). > Maybe we want the publish branch to override a

Re: [PATCH v2 0/9] Introduce publish tracking branch

2014-04-11 Thread Felipe Contreras
Matthieu Moy wrote: > Felipe Contreras writes: > > > As it has been discussed before, our support for triangular workflows is > > lacking, and the following patch series aims to improve that situation. > > I'm not a heavy user of triangular workflow, so I'm not in the best > position to comment

Re: [PATCH v2 0/9] Introduce publish tracking branch

2014-04-11 Thread Matthieu Moy
Felipe Contreras writes: > As it has been discussed before, our support for triangular workflows is > lacking, and the following patch series aims to improve that situation. I'm not a heavy user of triangular workflow, so I'm not in the best position to comment (and I have no time for a real rev

Re: [PATCH v2 0/9] Introduce publish tracking branch

2014-04-10 Thread Junio C Hamano
A handful of minimum tweaks [*1*] here and there were necessary in order to queue the series on 'pu', but to me, the feature looked like quite a straight-forward addition. I'd be dropping the jk/branch-at-publish-rebased from 'pu', at least tentatively, as that one was primarily Peff giving Ram a

[PATCH v2 0/9] Introduce publish tracking branch

2014-04-10 Thread Felipe Contreras
As it has been discussed before, our support for triangular workflows is lacking, and the following patch series aims to improve that situation. We have the concept of upstream branch (e.g. 'origin/master') which is to where our topic branches eventually should be merged to, so it makes sense that