Re: [PATCH 0/5] ff-refs: builtin command to fast-forward local refs

2015-11-30 Thread Junio C Hamano
Jeff King writes: > On Wed, Nov 18, 2015 at 10:56:02AM +0100, Johannes Schindelin wrote: > >> > For me I use this command more as a post-fetch: >> > >> > git fetch --all --prune && git-ff-refs >> > >> > I imagine that the big difference is in the number of branches that I >> >

Re: [PATCH 0/5] ff-refs: builtin command to fast-forward local refs

2015-11-24 Thread Jeff King
On Wed, Nov 18, 2015 at 10:56:02AM +0100, Johannes Schindelin wrote: > > For me I use this command more as a post-fetch: > > > > git fetch --all --prune && git-ff-refs > > > > I imagine that the big difference is in the number of branches that I > > maintain, and perhaps in the way that I use

Re: [PATCH 0/5] ff-refs: builtin command to fast-forward local refs

2015-11-18 Thread Johannes Schindelin
Hi Mike, On Tue, 17 Nov 2015, Mike Rappazzo wrote: > On Tue, Nov 17, 2015 at 10:28 AM, Michael J Gruber > wrote: > > Mike Rappazzo venit, vidit, dixit 17.11.2015 14:58: > > > > I still don't like the idea of having a new command just for the purpose > > of

Re: [PATCH 0/5] ff-refs: builtin command to fast-forward local refs

2015-11-17 Thread Michael J Gruber
Mike Rappazzo venit, vidit, dixit 17.11.2015 14:58: > (This message is off list) [cut the message part, though no big secrets there] Hi Mike, I don't think there's a point in discussing this off-list. Your intentions are clearer now, yes, or else I would have asked more. I still don't like the

Re: [PATCH 0/5] ff-refs: builtin command to fast-forward local refs

2015-11-17 Thread Mike Rappazzo
On Tue, Nov 17, 2015 at 10:28 AM, Michael J Gruber wrote: > Mike Rappazzo venit, vidit, dixit 17.11.2015 14:58: > > I still don't like the idea of having a new command just for the purpose > of fast-forwarding local branches from specified upstreams. > > What's wrong

Re: [PATCH 0/5] ff-refs: builtin command to fast-forward local refs

2015-11-11 Thread Michael J Gruber
Michael Rappazzo venit, vidit, dixit 11.11.2015 03:11: > This patch series is built on (based on) 'next' because it relies on > worktree.c > > `ff-refs` will update local branches which can be fast-forwarded to their > upstream tracking branch. Any branch which has diverged from the upstream >

Re: [PATCH 0/5] ff-refs: builtin command to fast-forward local refs

2015-11-11 Thread Mike Rappazzo
On Wed, Nov 11, 2015 at 5:41 AM, Michael J Gruber wrote: > Michael Rappazzo venit, vidit, dixit 11.11.2015 03:11: >> This patch series is built on (based on) 'next' because it relies on >> worktree.c >> >> `ff-refs` will update local branches which can be fast-forwarded

[PATCH 0/5] ff-refs: builtin command to fast-forward local refs

2015-11-10 Thread Michael Rappazzo
This patch series is built on (based on) 'next' because it relies on worktree.c `ff-refs` will update local branches which can be fast-forwarded to their upstream tracking branch. Any branch which has diverged from the upstream will be left untouched by this command. Additionally, there are