What's in git.git
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:42:17
Now the Kiwi thing is over, I have merged up most of the topic branches I've been holding back to the master branch. Here are the highlights: * "rev-list --remove-empty" by Linus, a step to help "annotate". * "diff -c/--cc" combined diff format. When used with diff-tree, they make a merge commit a bit more readable. They can also be used with diff-files with an unmerged index to see the difference to the working tree files from ours and theirs. * Fix "diff-tree" to honour info/grafts file while showing parents. When "rev-list --parents" output is piped to "diff-tree --stdin", I think it also should show a fake header, but that is not currently fixed. * "rev-parse v2.6.14..v2.6.16" fix by Linus, with a follow up fix to make "git whatchanged -- git-fetch-script" work again. * Various 'abbreviation' fixes. I'd like to do a 1.2 release with these sometime next week, but I would like to encourage people to upgrade to 1.1.5 (or tonight's "master") sooner rather than waiting for 1.2, since previous versions have a little problem that can lead to a core dump or worse. The "bind commit" thing is still in "pu"; since the discussion somehow stalled, it may stay there for a while. I have not been exercising it more than just using it in my regular workflow (meaning, I have not seen any regression but no tests on the additional features) and have not started playing with Porcelainish layer, primarily because I am not in urgent need for subprojects myself.