diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-08-14 14:23:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-14 14:23:53 -0700 |
| commit | 5cf00cbc0f0134d658c0507160854e677af6d199 (patch) | |
| tree | fd8a504418b0f0a21d59855b976428b1efe18fd9 /revision.h | |
| parent | fe8f41fb2a61b36d51099f895e9902fcccc2a2df (diff) | |
| parent | ee6cbf712edcbd1dc14993ab2452fbe882dc524a (diff) | |
| download | git-5cf00cbc0f0134d658c0507160854e677af6d199.tar.gz | |
Merge branch 'es/format-patch-interdiff' into es/format-patch-rangediff
* 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 c599c34da9..b30ea3a693 100644 --- a/revision.h +++ b/revision.h @@ -213,6 +213,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; |