diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-02-23 13:38:50 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-02-23 13:38:50 -0800 |
commit | ba998d33e22d6fce4445af5834dc227609672501 (patch) | |
tree | 17351a34256b8ebcf86d286f69f93dd49a2855da | |
parent | Merge branch 'ld/git-p4-expanded-keywords' (diff) | |
download | tgif-ba998d33e22d6fce4445af5834dc227609672501.tar.xz |
Update draft release notes to 1.7.10
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r-- | Documentation/RelNotes/1.7.10.txt | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/Documentation/RelNotes/1.7.10.txt b/Documentation/RelNotes/1.7.10.txt index 4ea69322bf..0add762b0a 100644 --- 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). + * "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. + * 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. @@ -60,6 +71,9 @@ Internal Implementation (please report possible regressions) * 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. @@ -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). + * 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 -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 |