diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-09-17 23:53:55 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-09-17 23:53:55 +0300 |
| commit | 688cb1c9891943db1575db38bc0575f75f8b928b (patch) | |
| tree | 0c240ea594d33be0c9a75098eb6d843dc92cb023 /revision.h | |
| parent | f3504ea3dd21b0a6d38bcd369efa0663cdc05416 (diff) | |
| parent | ee6cbf712edcbd1dc14993ab2452fbe882dc524a (diff) | |
Merge branch 'es/format-patch-interdiff'
"git format-patch" learned a new "--interdiff" option to explain
the difference between this version and the previous atttempt in
the cover letter (or after the tree-dashes as a comment).
* es/format-patch-interdiff:
format-patch: allow --interdiff to apply to a lone-patch
log-tree: show_log: make commentary block delimiting reusable
interdiff: teach show_interdiff() to indent interdiff
format-patch: teach --interdiff to respect -v/--reroll-count
format-patch: add --interdiff option to embed diff in cover letter
format-patch: allow additional generated content in make_cover_letter()
Diffstat (limited to 'revision.h')
| -rw-r--r-- | revision.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/revision.h b/revision.h index 1225957927..91bc180e37 100644 --- a/revision.h +++ b/revision.h @@ -219,6 +219,11 @@ struct rev_info { /* notes-specific options: which refs to show */ struct display_notes_opt notes_opt; + /* interdiff */ + const struct object_id *idiff_oid1; + const struct object_id *idiff_oid2; + const char *idiff_title; + /* commit counts */ int count_left; int count_right; |