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/diff-options.txt | |
| parent | b3e588a48af0ce15832c240887b9a3f9361d22bb (diff) | |
| parent | 5b162879e93dab3b4bcd66afdbea3a96660abd7d (diff) | |
| download | git-b7af6ae5cff8439fdf5b72f926cab2e614906af3.tar.gz git-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/diff-options.txt')
| -rw-r--r-- | Documentation/diff-options.txt | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 7805a0cca..2d77a1962 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -63,12 +63,7 @@ ifndef::git-format-patch[] Synonym for `-p --raw`. endif::git-format-patch[] ---compaction-heuristic:: ---no-compaction-heuristic:: - These are to help debugging and tuning an experimental - heuristic (which is off by default) that shifts the hunk - boundary in an attempt to make the resulting patch easier - to read. +include::diff-heuristic-options.txt[] --minimal:: Spend extra time to make sure the smallest possible |