Merge branch 'maint'

* maint:
  Update draft release notes to 1.8.0.2

1 files changed, 19 insertions, 0 deletions

diff --git a/Documentation/RelNotes/1.8.0.2.txt b/Documentation/RelNotes/1.8.0.2.txt
index 5d08021a8..8497e051d 100644
--- a/Documentation/RelNotes/1.8.0.2.txt
+++ b/Documentation/RelNotes/1.8.0.2.txt
@@ -4,6 +4,25 @@ Git v1.8.0.2 Release Notes
 Fixes since v1.8.0.1
 --------------------
 
+ * Various codepaths have workaround for a common misconfiguration to
+   spell "UTF-8" as "utf8", but it was not used uniformly.  Most
+   notably, mailinfo (which is used by "git am") lacked this support.
+
+ * We failed to mention a file without any content change but whose
+   permission bit was modified, or (worse yet) a new file without any
+   content in the "git diff --stat" output.
+
+ * When "--stat-count" hides a diffstat for binary contents, the total
+   number of added and removed lines at the bottom was computed
+   incorrectly.
+
+ * When "--stat-count" hides a diffstat for unmerged paths, the total
+   number of affected files at the bottom of the "diff --stat" output
+   was computed incorrectly.
+
+ * "diff --shortstat" miscounted the total number of affected files
+   when there were unmerged paths.
+
  * "git p4" used to try expanding malformed "$keyword$" that spans
    across multiple lines.