Merge branch 'mh/diff-indent-heuristic'
authorJunio C Hamano <gitster@pobox.com>
Mon, 26 Sep 2016 23:09:16 +0000 (16:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 26 Sep 2016 23:09:16 +0000 (16:09 -0700)
commitb7af6ae...cff8439fdf5b72f926cab2e614906af3
treebc9721c...62fa88e4c2824e04069380d40e09d2d9copy hash to clipboard (tree)
parentb3e588a...8af0ce15832c240887b9a3f9361d22bbcopy hash to clipboard (diff)
parent5b16287...e93dab3b4bcd66afdbea3a96660abd7dcopy hash to clipboard (diff)
Documentation/diff-config.txt
Documentation/diff-options.txt
builtin/blame.c
diff.c
diff.h
parse-options-cb.c
parse-options.h