diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-09-26 23:09:16 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-26 23:09:16 (GMT) |
| commit | b7af6ae5cff8439fdf5b72f926cab2e614906af3 (patch) | |
| tree | bc9721ce62fa88e4c2824e04069380d40e09d2d9 /parse-options.h | |
| parent | b3e588a48af0ce15832c240887b9a3f9361d22bb (diff) | |
| parent | 5b162879e93dab3b4bcd66afdbea3a96660abd7d (diff) | |
| download | git-b7af6ae5cff8439fdf5b72f926cab2e614906af3.zip git-b7af6ae5cff8439fdf5b72f926cab2e614906af3.tar.gz git-b7af6ae5cff8439fdf5b72f926cab2e614906af3.tar.bz2 | |
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 'parse-options.h')
| -rw-r--r-- | parse-options.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/parse-options.h b/parse-options.h index 78f8384..dcd8a09 100644 --- a/parse-options.h +++ b/parse-options.h @@ -228,6 +228,7 @@ extern int parse_opt_commits(const struct option *, const char *, int); extern int parse_opt_tertiary(const struct option *, const char *, int); extern int parse_opt_string_list(const struct option *, const char *, int); extern int parse_opt_noop_cb(const struct option *, const char *, int); +extern int parse_opt_unknown_cb(const struct option *, const char *, int); extern int parse_opt_passthru(const struct option *, const char *, int); extern int parse_opt_passthru_argv(const struct option *, const char *, int); |