What's cooking in git.git (Jan 2017, #03; Thu, 19)

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. The sixth batch of topics have bee

Re: What's cooking in git.git (Jan 2017, #03; Thu, 19)

> Junio C Hamano hat am 20. Januar 2017 um 00:37 > geschrieben: [snip] > * rh/mergetool-regression-fix (2017-01-10) 14 commits > (merged to 'next' on 2017-01-10 at e8e00c798b) > + mergetool: fix running in subdir when rerere enabled > + mergetool: take the "-O" out of $orderfile > + t7610

Re: What's cooking in git.git (Jan 2017, #03; Thu, 19)

Thomas Braun writes: >> * rh/mergetool-regression-fix (2017-01-10) 14 commits >> (merged to 'next' on 2017-01-10 at e8e00c798b) >> + mergetool: fix running in subdir when rerere enabled >> + mergetool: take the "-O" out of $orderfile >> + t7610: add test case for rerere+mergetool+subdir bug