Re: What's cooking in git.git (Jul 2017, #07; Mon, 24)

2017-07-26 Thread Junio C Hamano
Johannes Schindelin writes: >> * wd/rebase-conflict-guide (2017-07-17) 1 commit >> (merged to 'next' on 2017-07-20 at c78e758b23) >> + rebase: make resolve message clearer for inexperienced users >> >> Code clean-up. > > This is not a code clean-up. It is an improvement of the user experienc

Re: What's cooking in git.git (Jul 2017, #07; Mon, 24)

2017-07-25 Thread Junio C Hamano
Johannes Schindelin writes: > Hi Junio, > > On Mon, 24 Jul 2017, Junio C Hamano wrote: > >> * js/blame-lib (2017-07-24) 1 commit >> - blame: fix memory corruption scrambling revision name in error message >> >> A hotfix to a topic already in 'master'. >> >> Will merge to 'next'. > > This sou

Re: What's cooking in git.git (Jul 2017, #07; Mon, 24)

2017-07-25 Thread Johannes Schindelin
Hi Junio, On Mon, 24 Jul 2017, Junio C Hamano wrote: > * js/blame-lib (2017-07-24) 1 commit > - blame: fix memory corruption scrambling revision name in error message > > A hotfix to a topic already in 'master'. > > Will merge to 'next'. This sounds more critical than `next`, in particular

What's cooking in git.git (Jul 2017, #07; Mon, 24)

2017-07-24 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'. The ones marked with '.' do not appear in any of the integration branches, but I am still holding onto them. With help from Jiang, Dscho and Je