diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-09-26 16:09:16 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-09-26 16:09:16 -0700 |
commit | b7af6ae5cff8439fdf5b72f926cab2e614906af3 (patch) | |
tree | bc9721ce62fa88e4c2824e04069380d40e09d2d9 /Documentation/git-pack-refs.txt | |
parent | Merge branch 'rs/c-auto-resets-attributes' (diff) | |
parent | blame: honor the diff heuristic options and config (diff) | |
download | tgif-b7af6ae5cff8439fdf5b72f926cab2e614906af3.tar.xz |
Merge branch 'mh/diff-indent-heuristic'
Output from "git diff" can be made easier to read by selecting
which lines are common and which lines are added/deleted
intelligently when the lines before and after the changed section
are the same. A command line option is added to help with the
experiment to find a good heuristics.
* mh/diff-indent-heuristic:
blame: honor the diff heuristic options and config
parse-options: add parse_opt_unknown_cb()
diff: improve positioning of add/delete blocks in diffs
xdl_change_compact(): introduce the concept of a change group
recs_match(): take two xrecord_t pointers as arguments
is_blank_line(): take a single xrecord_t as argument
xdl_change_compact(): only use heuristic if group can't be matched
xdl_change_compact(): fix compaction heuristic to adjust ixo
Diffstat (limited to 'Documentation/git-pack-refs.txt')
0 files changed, 0 insertions, 0 deletions