@@ -119,8 +119,8 @@ UI, Workflows & Features
119119 * Project search in "gitweb" shows the substring that matched in the
120120 project name and description highlighted.
121121
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
122+ * A new script "diffall" is added to contrib/; it drives an
123+ external tool to perform a directory diff of two Git revisions
124124 in one go, unlike "difftool" that compares one file at a time.
125125
126126Foreign Interface
@@ -180,17 +180,25 @@ Unless otherwise noted, all the fixes since v1.7.9 in the maintenance
180180releases are contained in this release (see release notes to them for
181181details).
182182
183+ * The "remaining" subcommand to "git rerere" was not documented.
184+ (merge 3e7a1df ph/rerere-doc later to maint).
185+
183186 * "git tag -s" honored "gpg.program" configuration variable since
184187 1.7.9, but "git tag -v" and "git verify-tag" didn't.
185188 (merge a2c2506 az/verify-tag-use-gpg-config later to maint).
186189
190+ * When "git config" diagnoses an error in a configuration file and
191+ shows the line number for the offending line, it miscounted if the
192+ error was at the end of line.
193+ (merge 4b34059 ms/maint-config-error-at-eol-linecount later to maint).
194+
187195 * "gitweb" used to drop warnings in the log file when "heads" view is
188196 accessed in a repository whose HEAD does not point at a valid
189197 branch.
190198
191199---
192200exec >/var/tmp/1
193- O=v1.7.10-rc0-40-g57cec0a
201+ O=v1.7.10-rc0-50-gd973dc0
194202echo O=$(git describe)
195203git log --first-parent --oneline ^maint $O..
196204echo
0 commit comments