summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-03-12 22:59:06 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-03-12 22:59:06 (GMT)
commitfa678feb7ca12e306e2eaeb0078028505ab3318a (patch)
treeaac0d88e8f5624bbca35a9060bf0495fc31d16c2
parent57cec0aec77eb33bfc1eaaa5fb128f8799bbae43 (diff)
downloadgit-fa678feb7ca12e306e2eaeb0078028505ab3318a.zip
git-fa678feb7ca12e306e2eaeb0078028505ab3318a.tar.gz
git-fa678feb7ca12e306e2eaeb0078028505ab3318a.tar.bz2
Update draft release notes to 1.7.10 before -rc1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes/1.7.10.txt33
1 files changed, 12 insertions, 21 deletions
diff --git a/Documentation/RelNotes/1.7.10.txt b/Documentation/RelNotes/1.7.10.txt
index a8fd0ac..65df74b 100644
--- a/Documentation/RelNotes/1.7.10.txt
+++ b/Documentation/RelNotes/1.7.10.txt
@@ -25,6 +25,10 @@ Compatibility Notes
"git merge" command if you know everybody who uses your script has
Git v1.7.8 or newer.
+ * The "--binary/-b" options to "git am" have been a no-op for quite a
+ while and was deprecated in mid 2008 (v1.6.0). When you give these
+ options to "git am", it will now fail with an error.
+
Updates since v1.7.9
--------------------
@@ -115,6 +119,10 @@ UI, Workflows & Features
* Project search in "gitweb" shows the substring that matched in the
project name and description highlighted.
+ * A new script "diffall" is added to contrib/; it drives an external
+ an external tool to perform a directory diff of two Git revisions
+ in one go, unlike "difftool" that compares one file at a time.
+
Foreign Interface
* Improved handling of views, labels and branches in "git-p4" (in contrib).
@@ -172,34 +180,17 @@ 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).
- * "git bundle" did not record boundary commits correctly when there
- are many of them.
- (merge efe4be1 tr/maint-bundle-boundary later to maint).
-
- * "git diff-index" and its friends at the plumbing level showed the
- "diff --git" header and nothing else for a path whose cached stat
- info is dirty without actual difference when asked to produce a
- patch. This was a longstanding bug that we could have fixed long
- time ago.
- (merge b3f01ff jc/maint-diff-patch-header later to maint).
-
- * The code to synthesize the fake ancestor tree used by 3-way merge
- fallback in "git am" was not prepared to read a patch created with
- a non-standard -p<num> value.
- (merge a61ba26 jc/am-3-nonstandard-popt later to maint).
+ * "git tag -s" honored "gpg.program" configuration variable since
+ 1.7.9, but "git tag -v" and "git verify-tag" didn't.
+ (merge a2c2506 az/verify-tag-use-gpg-config 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.
- * "gitweb" did use quotemeta() to prepare search string when asked to
- do a fixed-string project search, but did not use it by mistake and
- used the user-supplied string instead.
- (merge e65ceb6 jn/maint-do-not-match-with-unsanitized-searchtext later to maint).
-
---
exec >/var/tmp/1
-O=v1.7.10-rc0-15-g9a4c97e
+O=v1.7.10-rc0-40-g57cec0a
echo O=$(git describe)
git log --first-parent --oneline ^maint $O..
echo