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 /revision.h | |
| parent | Merge branch 'es/format-patch-interdiff' (diff) | |
| parent | format-patch: allow --range-diff to apply to a lone-patch (diff) | |
| download | tgif-881c019ea6a0a45f97fb8a1865a88b07263a02ca.tar.xz | |
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 'revision.h')
| -rw-r--r-- | revision.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/revision.h b/revision.h index 91bc180e37..2b30ac270d 100644 --- a/revision.h +++ b/revision.h @@ -224,6 +224,12 @@ struct rev_info { const struct object_id *idiff_oid2; const char *idiff_title; + /* range-diff */ + const char *rdiff1; + const char *rdiff2; + int creation_factor; + const char *rdiff_title; + /* commit counts */ int count_left; int count_right; |