diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-09-17 13:53:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-09-17 13:53:56 -0700 |
| commit | 881c019ea6a0a45f97fb8a1865a88b07263a02ca (patch) | |
| tree | 1bbb5da82ce92a3ba85114ae641d8fcf62b8d7d6 /range-diff.h | |
| parent | Merge branch 'es/format-patch-interdiff' (diff) | |
| parent | format-patch: allow --range-diff to apply to a lone-patch (diff) | |
| download | git-881c019ea6a0a45f97fb8a1865a88b07263a02ca.tar.gz git-881c019ea6a0a45f97fb8a1865a88b07263a02ca.zip | |
Merge branch 'es/format-patch-rangediff'
"git format-patch" learned a new "--range-diff" option to explain
the difference between this version and the previous attempt in
the cover letter (or after the tree-dashes as a comment).
* es/format-patch-rangediff:
format-patch: allow --range-diff to apply to a lone-patch
format-patch: add --creation-factor tweak for --range-diff
format-patch: teach --range-diff to respect -v/--reroll-count
format-patch: extend --range-diff to accept revision range
format-patch: add --range-diff option to embed diff in cover letter
range-diff: relieve callers of low-level configuration burden
range-diff: publish default creation factor
range-diff: respect diff_option.file rather than assuming 'stdout'
Diffstat (limited to 'range-diff.h')
| -rw-r--r-- | range-diff.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/range-diff.h b/range-diff.h index 2407d46a30..190593f0c7 100644 --- a/range-diff.h +++ b/range-diff.h @@ -3,7 +3,10 @@ #include "diff.h" +#define RANGE_DIFF_CREATION_FACTOR_DEFAULT 60 + int show_range_diff(const char *range1, const char *range2, - int creation_factor, struct diff_options *diffopt); + int creation_factor, int dual_color, + struct diff_options *diffopt); #endif |