@@ -25,6 +25,10 @@ Compatibility Notes
2525 "git merge" command if you know everybody who uses your script has
2626 Git v1.7.8 or newer.
2727
28+ * The "--binary/-b" options to "git am" have been a no-op for quite a
29+ while and was deprecated in mid 2008 (v1.6.0). When you give these
30+ options to "git am", it will now fail with an error.
31+
2832
2933Updates since v1.7.9
3034--------------------
@@ -115,6 +119,10 @@ UI, Workflows & Features
115119 * Project search in "gitweb" shows the substring that matched in the
116120 project name and description highlighted.
117121
122+ * A new script "diffall" is added to contrib/; it drives an external
123+ an external tool to perform a directory diff of two Git revisions
124+ in one go, unlike "difftool" that compares one file at a time.
125+
118126Foreign Interface
119127
120128 * 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
172180releases are contained in this release (see release notes to them for
173181details).
174182
175- * "git bundle" did not record boundary commits correctly when there
176- are many of them.
177- (merge efe4be1 tr/maint-bundle-boundary later to maint).
178-
179- * "git diff-index" and its friends at the plumbing level showed the
180- "diff --git" header and nothing else for a path whose cached stat
181- info is dirty without actual difference when asked to produce a
182- patch. This was a longstanding bug that we could have fixed long
183- time ago.
184- (merge b3f01ff jc/maint-diff-patch-header later to maint).
185-
186- * The code to synthesize the fake ancestor tree used by 3-way merge
187- fallback in "git am" was not prepared to read a patch created with
188- a non-standard -p<num> value.
189- (merge a61ba26 jc/am-3-nonstandard-popt later to maint).
183+ * "git tag -s" honored "gpg.program" configuration variable since
184+ 1.7.9, but "git tag -v" and "git verify-tag" didn't.
185+ (merge a2c2506 az/verify-tag-use-gpg-config later to maint).
190186
191187 * "gitweb" used to drop warnings in the log file when "heads" view is
192188 accessed in a repository whose HEAD does not point at a valid
193189 branch.
194190
195- * "gitweb" did use quotemeta() to prepare search string when asked to
196- do a fixed-string project search, but did not use it by mistake and
197- used the user-supplied string instead.
198- (merge e65ceb6 jn/maint-do-not-match-with-unsanitized-searchtext later to maint).
199-
200191---
201192exec >/var/tmp/1
202- O=v1.7.10-rc0-15-g9a4c97e
193+ O=v1.7.10-rc0-40-g57cec0a
203194echo O=$(git describe)
204195git log --first-parent --oneline ^maint $O..
205196echo
0 commit comments