Update draft release notes to 1.7.10

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/RelNotes/1.7.10.txt b/Documentation/RelNotes/1.7.10.txt
index 4ea69322bf89da922605aab04daf5785efa12b9e..0add762b0a03ebfdf0718cab071bd44c0e8b30cc 100644 (file)
--- a/Documentation/RelNotes/1.7.10.txt
+++ b/Documentation/RelNotes/1.7.10.txt
@@ -8,9 +8,20 @@ UI, Workflows & Features
 
  * Improved handling of views, labels and branches in git-p4 (in contrib).
 
 
  * Improved handling of views, labels and branches in git-p4 (in contrib).
 

+ * "git-p4" (in contrib) suffered from unnecessary merge conflicts when
+   p4 expanded the embedded $RCS$-like keywords; it can be now told to
+   unexpand them.
+
+ * Some "git-svn" updates.
+

  * "vcs-svn"/"svn-fe" learned to read dumps with svn-deltas and
    support incremental imports.
 
  * "vcs-svn"/"svn-fe" learned to read dumps with svn-deltas and
    support incremental imports.
 

+ * The configuration mechanism learned an "include" facility; an
+   assignment to the include.path pseudo-variable causes the named
+   file to be included in-place when Git looks up configuration
+   variables.
+

  * "git am" learned to pass "-b" option to underlying "git mailinfo", so
    that bracketed string other than "PATCH" at the beginning can be kept.
 
  * "git am" learned to pass "-b" option to underlying "git mailinfo", so
    that bracketed string other than "PATCH" at the beginning can be kept.
 


@@ -60,6 +71,9 @@ Internal Implementation (please report possible regressions)
 
  * The test suite supports the new "test_pause" helper function.
 
 
  * The test suite supports the new "test_pause" helper function.
 

+ * Parallel to the test suite, there is a beginning of performance
+   benchmarking framework.
+

  * t/Makefile is adjusted to prevent newer versions of GNU make from
    running tests in seemingly random order.
 
  * t/Makefile is adjusted to prevent newer versions of GNU make from
    running tests in seemingly random order.
 


@@ -73,13 +87,22 @@ Unless otherwise noted, all the fixes since v1.7.9 in the maintenance
 releases are contained in this release (see release notes to them for
 details).
 
 releases are contained in this release (see release notes to them for
 details).
 

+ * The config.mak.autogen generated by optional autoconf support tried
+   to link the binary with -lintl even when libintl.h is missing from
+   the system.
+   (merge a8356d4 js/configure-libintl later to maint).
+
+ * "git add --refresh <pathspec>" used to warn about unmerged paths
+   outside the given pathspec.
+   (merge 3d1f148 jc/add-refresh-unmerged later to maint).
+

  * "gitweb" used to drop warnings in the log file when "heads" view is
    accessed in a repository whose HEAD does not point at a valid
    branch.
 
 ---
 exec >/var/tmp/1
  * "gitweb" used to drop warnings in the log file when "heads" view is
    accessed in a repository whose HEAD does not point at a valid
    branch.
 
 ---
 exec >/var/tmp/1

-O=v1.7.9.1-289-g5609586
+O=v1.7.9.2-261-gd065f68

 echo O=$(git describe)
 git log --first-parent --oneline ^maint $O..
 echo
 echo O=$(git describe)
 git log --first-parent --oneline ^maint $O..
 echo