From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 17 Sep 2018 20:53:55 +0000 (-0700)
Subject: Merge branch 'es/format-patch-interdiff'
X-Git-Tag: v2.20.0-rc0~240
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=688cb1c9891943db1575db38bc0575f75f8b928b;p=thirdparty%2Fgit.git

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()
---

688cb1c9891943db1575db38bc0575f75f8b928b
diff --cc Makefile
index 7cf6820013,b2685190e1..b567ccca45
--- a/Makefile
+++ b/Makefile
@@@ -884,7 -871,7 +884,8 @@@ LIB_OBJS += linear-assignment.
  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
  LIB_OBJS += line-log.o
diff --cc builtin/log.c
index 517c5e6789,e990027c28..df42011312
--- a/builtin/log.c
+++ b/builtin/log.c
@@@ -30,8 -30,7 +30,9 @@@
  #include "gpg-interface.h"
  #include "progress.h"
  #include "commit-slab.h"
 +#include "repository.h"
 +#include "commit-reach.h"
+ #include "interdiff.h"
  
  #define MAIL_DEFAULT_WRAP 72