diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-05-21 04:02:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-05-21 04:02:17 -0700 |
| commit | 1bdd46cd3a2fe1e0aeb965fb0edb493064e24495 (patch) | |
| tree | 9fa257f211ffb509cb07dac585f5a80b433d795c /diff.h | |
| parent | Merge branch 'sp/maint-describe-tiebreak-with-tagger-date' (diff) | |
| parent | diff: add --word-diff option that generalizes --color-words (diff) | |
| download | git-1bdd46cd3a2fe1e0aeb965fb0edb493064e24495.tar.gz git-1bdd46cd3a2fe1e0aeb965fb0edb493064e24495.zip | |
Merge branch 'tr/word-diff'
* tr/word-diff:
diff: add --word-diff option that generalizes --color-words
Conflicts:
diff.c
Diffstat (limited to 'diff.h')
| -rw-r--r-- | diff.h | 10 |
1 files changed, 9 insertions, 1 deletions
@@ -54,7 +54,7 @@ typedef void (*diff_format_fn_t)(struct diff_queue_struct *q, #define DIFF_OPT_FIND_COPIES_HARDER (1 << 6) #define DIFF_OPT_FOLLOW_RENAMES (1 << 7) #define DIFF_OPT_COLOR_DIFF (1 << 8) -#define DIFF_OPT_COLOR_DIFF_WORDS (1 << 9) +/* (1 << 9) unused */ #define DIFF_OPT_HAS_CHANGES (1 << 10) #define DIFF_OPT_QUICK (1 << 11) #define DIFF_OPT_NO_INDEX (1 << 12) @@ -79,6 +79,13 @@ typedef void (*diff_format_fn_t)(struct diff_queue_struct *q, #define DIFF_XDL_SET(opts, flag) ((opts)->xdl_opts |= XDF_##flag) #define DIFF_XDL_CLR(opts, flag) ((opts)->xdl_opts &= ~XDF_##flag) +enum diff_words_type { + DIFF_WORDS_NONE = 0, + DIFF_WORDS_PORCELAIN, + DIFF_WORDS_PLAIN, + DIFF_WORDS_COLOR +}; + struct diff_options { const char *filter; const char *orderfile; @@ -108,6 +115,7 @@ struct diff_options { int stat_width; int stat_name_width; const char *word_regex; + enum diff_words_type word_diff; /* this is set by diffcore for DIFF_FORMAT_PATCH */ int found_changes; |