summaryrefslogtreecommitdiff
path: root/t/t6037-merge-ours-theirs.sh
diff options
context:
space:
mode:
authorLibravatar Eric Sunshine <sunshine@sunshineco.com>2018-07-22 05:57:05 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-07-23 12:50:06 -0700
commit126facf8219177bc265be725a8579c86ebdf99a5 (patch)
tree951a68d3b89e0123c1ec0e75de85579a2609dce2 /t/t6037-merge-ours-theirs.sh
parentformat-patch: allow additional generated content in make_cover_letter() (diff)
downloadtgif-126facf8219177bc265be725a8579c86ebdf99a5.tar.xz
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 't/t6037-merge-ours-theirs.sh')
0 files changed, 0 insertions, 0 deletions