From 9a8eea9604ade731c3d0ff10136f2ae81b2a13c8 Mon Sep 17 00:00:00 2001
From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 10 Sep 2012 15:30:46 -0700
Subject: [PATCH] Almost 1.7.11.6

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 Documentation/RelNotes/1.7.11.6.txt | 30 ++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/Documentation/RelNotes/1.7.11.6.txt b/Documentation/RelNotes/1.7.11.6.txt
index e548a598247..84ba827b1b6 100644
--- a/Documentation/RelNotes/1.7.11.6.txt
+++ b/Documentation/RelNotes/1.7.11.6.txt
@@ -4,7 +4,8 @@ Git v1.7.11.6 Release Notes
 Fixes since v1.7.11.5
 ---------------------
 
-This is primarily documentation and low-impact code clarification.
+This consists primarily of documentation updates and low-impact code
+clarification and bugfixes.
 
  - "ciabot" script (in contrib/) has been updated with extensive
    documentation.
@@ -32,3 +33,30 @@ This is primarily documentation and low-impact code clarification.
  - "git commit --amend" let the user edit the log message and then
    died when the human-readable committer name was given
    insufficiently by getpwent(3).
+
+ - The reflog entries left by "git rebase" and "git rebase -i" were
+   inconsistent (the interactive one gave an abbreviated object name).
+
+ - When the user exports a non-default IFS without HT, scripts that
+   rely on being able to parse "ls-files -s | while read a b c..."
+   started to fail.  Protect them from such a misconfiguration.
+
+ - When "git push" triggered the automatic gc on the receiving end, a
+   message from "git prune" that said it was removing cruft leaked to
+   the standard output, breaking the communication protocol.
+
+ - "git diff" had a confusion between taking data from a path in the
+   working tree and taking data from an object that happens to have
+   name 0{40} recorded in a tree.
+
+ - "git send-email" did not unquote encoded words that appear on the
+   header correctly, and lost "_" from strings.
+
+ - When the user gives an argument that can be taken as both a
+   revision name and a pathname without disambiguating with "--", we
+   used to give a help message "Use '--' to separate".  The message
+   has been clarified to show where that '--' goes on the command
+   line.
+
+ - "gitweb" when used with PATH_INFO failed to notice directories with
+   SP (and other characters that need URL-style quoting) in them.