From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 14 Aug 2018 21:23:53 +0000 (-0700)
Subject: Merge branch 'es/format-patch-interdiff' into es/format-patch-rangediff
X-Git-Tag: v2.20.0-rc0~239^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5cf00cbc0f0134d658c0507160854e677af6d199;p=thirdparty%2Fgit.git

Merge branch 'es/format-patch-interdiff' into es/format-patch-rangediff

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

5cf00cbc0f0134d658c0507160854e677af6d199
diff --cc builtin/log.c
index 574595132a,e990027c28..fcc2f4dcc8
--- a/builtin/log.c
+++ b/builtin/log.c
@@@ -30,7 -30,7 +30,8 @@@
  #include "gpg-interface.h"
  #include "progress.h"
  #include "commit-slab.h"
 +#include "repository.h"
+ #include "interdiff.h"
  
  #define MAIL_DEFAULT_WRAP 72