diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-09-17 20:53:55 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-09-17 20:53:55 (GMT) |
| commit | 688cb1c9891943db1575db38bc0575f75f8b928b (patch) | |
| tree | 0c240ea594d33be0c9a75098eb6d843dc92cb023 /Makefile | |
| parent | f3504ea3dd21b0a6d38bcd369efa0663cdc05416 (diff) | |
| parent | ee6cbf712edcbd1dc14993ab2452fbe882dc524a (diff) | |
| download | git-688cb1c9891943db1575db38bc0575f75f8b928b.zip git-688cb1c9891943db1575db38bc0575f75f8b928b.tar.gz git-688cb1c9891943db1575db38bc0575f75f8b928b.tar.bz2 | |
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 'Makefile')
| -rw-r--r-- | Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -884,6 +884,7 @@ LIB_OBJS += linear-assignment.o LIB_OBJS += help.o LIB_OBJS += hex.o LIB_OBJS += ident.o +LIB_OBJS += interdiff.o LIB_OBJS += json-writer.o LIB_OBJS += kwset.o LIB_OBJS += levenshtein.o |