Merge branch 'maint'

diff --git a/Documentation/RelNotes/1.7.9.txt b/Documentation/RelNotes/1.7.9.txt
index 9689efa986c27ffdc9684f62767bfc7cd93fb113..79397eb6c78e7895ee8bfba74df298c6381ec5db 100644 (file)
--- a/Documentation/RelNotes/1.7.9.txt
+++ b/Documentation/RelNotes/1.7.9.txt
@@ -48,6 +48,9 @@ Updates since v1.7.8
  * "git commit" detects and rejects an attempt to stuff NUL byte in
    the commit log message.
 
+ * "git commit" learned "-S" to GPG-sign the commit; this can be shown
+   with the "--show-signature" option to "git log".
+
  * fsck and prune are relatively lengthy operations that still go
    silent while making the end-user wait. They learned to give progress
    output like other slow operations.
@@ -64,6 +67,10 @@ Updates since v1.7.8
    signed tag is recorded in the resulting merge commit for later
    auditing.
 
+ * "git log" learned "--show-signature" option to show the signed tag
+   that was merged that is embedded in the merge commit. It also can
+   show the signature made on the commit with "git commit -S".
+
  * "git branch --edit-description" can be used to add descriptive text
    to explain what a topic branch is about.
 
@@ -99,10 +106,6 @@ Unless otherwise noted, all the fixes since v1.7.8 in the maintenance
 releases are contained in this release (see release notes to them for
 details).
 
- * gitweb did not correctly fall back to configured $fallback_encoding
-   that is not 'latin1'.
-   (merge b13e3ea jn/maint-gitweb-utf8-fix later to maint).
-
 --
 exec >/var/tmp/1
 O=v1.7.8.2-301-g48de656