checkout: tone down the "forked status" diagnostic messages

diff --git a/Documentation/RelNotes-1.5.4.txt b/Documentation/RelNotes-1.5.4.txt
index c05de3d1d82d95a97264366f05e85913e524254d..9c864c9def3ece2e42189076922cf19548474921 100644 (file)
--- a/Documentation/RelNotes-1.5.4.txt
+++ b/Documentation/RelNotes-1.5.4.txt
@@ -10,6 +10,9 @@ Removal
  * As git-commit and git-status have been rewritten, "git runstatus"
    helper script lost all its users and has been removed.
 
+ * Curl library older than 7.10 is not supported by "git http-push",
+   as it does not work without CURLM.
+
 
 Deprecation notices
 -------------------
@@ -46,6 +49,10 @@ Deprecation notices
    and works for all transports; "git peek-remote" will be removed in
    the future.
 
+ * "git repo-config" which was an old name for "git config" command
+   has been supported without being advertised for a long time.  The
+   next feature release will remove it.
+
  * From v1.6.0, the repack.usedeltabaseoffset config option will default
    to true, which will give denser packfiles (i.e. more efficient storage).
    The downside is that git older than version 1.4.4 will not be able
@@ -61,7 +68,7 @@ Deprecation notices
 Updates since v1.5.3
 --------------------
 
- * Comes with much improved gitk.
+ * Comes with much improved gitk, with i18n.
 
  * Comes with "git gui" 0.9.1 with i18n.
 
@@ -356,8 +363,10 @@ series.
  * Recent versions of AsciiDoc 8 has a change to break our
    documentation; a workaround has been implemented.
 
+ * "git diff --color-words" colored context lines in a wrong color.
+
 --
 exec >/var/tmp/1
-O=v1.5.4-rc2-59-g2370781
+O=v1.5.4-rc4
 echo O=`git describe refs/heads/master`
 git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint