Re: What's cooking in git.git (preview)

2017-01-09 Thread Junio C Hamano
Johannes Schindelin writes: > Hi Junio, > > On Sun, 8 Jan 2017, Junio C Hamano wrote: > >> * js/difftool-builtin (2017-01-08) 4 commits >> - t7800: run both builtin and scripted difftool, for now >> - difftool: implement the functionality in the builtin >> - difftool: add a skeleton for the up

Re: What's cooking in git.git (preview)

2017-01-09 Thread Johannes Schindelin
Hi Junio, On Sun, 8 Jan 2017, Junio C Hamano wrote: > * js/difftool-builtin (2017-01-08) 4 commits > - t7800: run both builtin and scripted difftool, for now > - difftool: implement the functionality in the builtin > - difftool: add a skeleton for the upcoming builtin > - git_exec_path: avoid

What's cooking in git.git (preview)

2017-01-08 Thread Junio C Hamano
There still are topics that haven't been looked at, but here is a snapshot of my tonight's status. The tip of 'pu' is known to be broken, so those who want to vet and veto topics that are outside but close to 'next' may want to try the tip of 'jch' instead (find it in "git log --first-parent maste