From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 21 Feb 2018 23:41:32 +0000 (-0800)
Subject: Merge branch 'master' into next
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2e18187dfdb805eb42926ca430828b89b45f5da7?hp=9a9cb40c2f89413b9c3330249e20686b9ab050fb

Merge branch 'master' into next

* master:
Fourth batch for 2.17
---

diff --git a/Documentation/RelNotes/2.17.0.txt b/Documentation/RelNotes/2.17.0.txt
index 1fe7b61a67..db87393f4a 100644
--- a/Documentation/RelNotes/2.17.0.txt
+++ b/Documentation/RelNotes/2.17.0.txt
@@ -10,6 +10,15 @@ UI, Workflows & Features
    to limit the findings to changes that involve the named object.
    (merge 4d8c51aa19 sb/diff-blobfind-pickaxe later to maint).
 
+ * "git format-patch" learned to give 72-cols to diffstat, which is
+   consistent with other line length limits the subcommand uses for
+   its output meant for e-mails.
+
+ * The log from "git daemon" can be redirected with a new option; one
+   relevant use case is to send the log to standard error (instead of
+   syslog) when running it from inetd.
+
+ * "git rebase" learned to take "--allow-empty-message" option.
 
 Performance, Internal Implementation, Development Support etc.
 
@@ -166,6 +175,9 @@ Fixes since v2.16
    title is spread across physically multiple lines.
    (merge 1cf823fb68 tg/reset-hard-show-head-with-pretty later to maint).
 
+ * Test fixes.
+   (merge 63b1a175ee sg/test-i18ngrep later to maint).
+
  * Other minor doc, test and build updates and code cleanups.
    (merge e2a5a028c7 bw/oidmap-autoinit later to maint).
    (merge f0a6068a9f ys/bisect-object-id-missing-conversion-fix later to maint).