summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorEric Sunshine <sunshine@sunshineco.com>2018-07-22 09:57:05 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-07-23 19:50:06 (GMT)
commit126facf8219177bc265be725a8579c86ebdf99a5 (patch)
tree951a68d3b89e0123c1ec0e75de85579a2609dce2 /Makefile
parentfa5b7ea670f4c5ee377e7fce799300829eabb291 (diff)
downloadgit-126facf8219177bc265be725a8579c86ebdf99a5.zip
git-126facf8219177bc265be725a8579c86ebdf99a5.tar.gz
git-126facf8219177bc265be725a8579c86ebdf99a5.tar.bz2
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 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 08e5c54..b268519 100644
--- a/Makefile
+++ b/Makefile
@@ -871,6 +871,7 @@ LIB_OBJS += hashmap.o
LIB_OBJS += help.o
LIB_OBJS += hex.o
LIB_OBJS += ident.o
+LIB_OBJS += interdiff.o
LIB_OBJS += kwset.o
LIB_OBJS += levenshtein.o
LIB_OBJS += line-log.o