On 04/29/2017 02:40 PM, Jeff King wrote: > On Fri, Apr 28, 2017 at 06:33:12PM -0400, Marc Branchaud wrote: > >> v2: Fixed up the commit messages and added tests. >> >> Marc Branchaud (2): >> diff: make the indent heuristic part of diff's basic configuration >> diff: have the diff-* builtins configure diff before initializing >> revisions >> >> Stefan Beller (1): >> diff: enable indent heuristic by default > > Thanks, these look fine to me. I'd like to get an ACK from Michael, in > case he had some other reason for omitting them from git_diff_ui_config > (from my recollection, it's probably just a mix of conservatism and > following what the compaction heuristic had done). That's exactly right. The only discussion I remember about broadening the scope of diff options was with regards to `blame` [1]. I don't really have enough overview of these configuration topics to have much an opinion. Michael [1] http://public-inbox.org/git/xmqqtwebwhbg.fsf@xxxxxxxxxxxxxxxxxxxxxxxxxxx/