Re: What's cooking in git.git (Dec 2015, #02; Fri, 4)

2015-12-07 Thread Jeff King
On Sun, Dec 06, 2015 at 10:12:18AM -0600, Edmundo Carmona Antoranz wrote: > Hi, Junio, Jeff! > > On Fri, Dec 4, 2015 at 5:15 PM, Junio C Hamano wrote: > > * ec/annotate-deleted (2015-11-20) 1 commit > > - annotate: skip checking working tree if a revision is provided > > > >

Re: What's cooking in git.git (Dec 2015, #02; Fri, 4)

2015-12-07 Thread Junio C Hamano
Jeff King writes: > On Sun, Dec 06, 2015 at 10:12:18AM -0600, Edmundo Carmona Antoranz wrote: > >> Hi, Junio, Jeff! >> >> On Fri, Dec 4, 2015 at 5:15 PM, Junio C Hamano wrote: >> > * ec/annotate-deleted (2015-11-20) 1 commit >> > - annotate: skip checking

Re: What's cooking in git.git (Dec 2015, #02; Fri, 4)

2015-12-06 Thread Edmundo Carmona Antoranz
Hi, Junio, Jeff! On Fri, Dec 4, 2015 at 5:15 PM, Junio C Hamano wrote: > * ec/annotate-deleted (2015-11-20) 1 commit > - annotate: skip checking working tree if a revision is provided > > Usability fix for annotate-specific " " syntax with deleted > files. > > Waiting for

Re: What's cooking in git.git (Dec 2015, #02; Fri, 4)

2015-12-06 Thread Eric Sunshine
On Sun, Dec 6, 2015 at 11:12 AM, Edmundo Carmona Antoranz wrote: > And, another thing, I had sent the fifth version of my patch about > progress for blame where I took care of all the comments hat Junio > stated before and I got no comments since. I hoped that patch would be

Re: What's cooking in git.git (Dec 2015, #02; Fri, 4)

2015-12-04 Thread Jeff King
On Fri, Dec 04, 2015 at 03:15:58PM -0800, Junio C Hamano wrote: > You can find the normal integration branches at: > > https://github.com/git/git/ > > and all topic branches at: > > https://github.com/peff/git/ > > But note that I will _not_ be pushing to kernel.org. You may want to

What's cooking in git.git (Dec 2015, #02; Fri, 4)

2015-12-04 Thread Junio C Hamano
Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. A big thank-you to Peff for managing the list traffic during my absence for the past few weeks. I think my tree is now back in shape and I

Re: What's cooking in git.git (Dec 2015, #02; Fri, 4)

2015-12-04 Thread Junio C Hamano
Jeff King writes: > You may want to update this in the whats-cooking template. :) X-<. This is a bit tricky in that most of the time I want to retain the customization I made to the top-portion, and this part does not go through a three-way merge as it probably should. > > diff