pretty.c: format string with truncate respects logOutputEncoding

diff --git a/Documentation/RelNotes/2.0.0.txt b/Documentation/RelNotes/2.0.0.txt
index 35e353e2137253644755d3c4f2c9dcac67428e30..6e628d47995c58c5d46cb3a737bb7f5a983e8ac6 100644 (file)
--- a/Documentation/RelNotes/2.0.0.txt
+++ b/Documentation/RelNotes/2.0.0.txt
@@ -89,8 +89,8 @@ UI, Workflows & Features
    "-h" (no header) and "-c" (count) options are given.
 
  * "git push" via transport-helper interface (e.g. remote-hg) has
-   been updated to allow ref deletion in a way similar to the natively
-   supported transports.
+   been updated to allow forced ref updates in a way similar to the
+   natively supported transports.
 
  * The "simple" mode is the default for "git push".
 
@@ -179,6 +179,10 @@ Unless otherwise noted, all the fixes since v1.9 in the maintenance
 track are contained in this release (see the maintenance releases'
 notes for details).
 
+ * "git p4" was broken in 1.9 release to deal with changes in binary
+   files.
+   (merge 749b668 cl/p4-use-diff-tree later to maint).
+
  * The shell prompt script (in contrib/), when using the PROMPT_COMMAND
    interface, used an unsafe construct when showing the branch name in
    $PS1.