diff options
author | Eric Sunshine <sunshine@sunshineco.com> | 2018-07-22 12:57:05 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-07-23 22:50:06 +0300 |
commit | 126facf8219177bc265be725a8579c86ebdf99a5 (patch) | |
tree | 951a68d3b89e0123c1ec0e75de85579a2609dce2 /revision.h | |
parent | fa5b7ea670f4c5ee377e7fce799300829eabb291 (diff) |
format-patch: add --interdiff option to embed diff in cover letter
When submitting a revised version of a patch series, it can be helpful
(to reviewers) to include a summary of changes since the previous
attempt in the form of an interdiff, however, doing so involves manually
copy/pasting the diff into the cover letter.
Add an --interdiff option to automate this process. The argument to
--interdiff specifies the tip of the previous attempt against which to
generate the interdiff. For example:
git format-patch --cover-letter --interdiff=v1 -3 v2
The previous attempt and the patch series being formatted must share a
common base.
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'revision.h')
-rw-r--r-- | revision.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/revision.h b/revision.h index bf2239f876..61931fbac5 100644 --- a/revision.h +++ b/revision.h @@ -212,6 +212,10 @@ 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; + /* commit counts */ int count_left; int count_right; |