Git 2.16

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/RelNotes/2.16.0.txt b/Documentation/RelNotes/2.16.0.txt
index 919f3eb3ea66f4620d8b6dbf92cab25d45c50ecb..0c81c5915fdbdbb9f9225211f7558954c1aa242d 100644 (file)
--- a/Documentation/RelNotes/2.16.0.txt
+++ b/Documentation/RelNotes/2.16.0.txt
@@ -62,8 +62,11 @@ UI, Workflows & Features
  * The SubmittingPatches document has been converted to produce an
    HTML version via AsciiDoc/Asciidoctor.
 
  * The SubmittingPatches document has been converted to produce an
    HTML version via AsciiDoc/Asciidoctor.
 

- * We learned to talk to watchman to speed up "git status" and other
-   operations that need to see which paths have been modified.
+ * We learned to optionally talk to a file system monitor via new
+   fsmonitor extension to speed up "git status" and other operations
+   that need to see which paths have been modified.  Currently we only
+   support "watchman".  See File System Monitor section of
+   git-update-index(1) for more detail.

 
  * The "diff" family of commands learned to ignore differences in
    carriage return at the end of line.
 
  * The "diff" family of commands learned to ignore differences in
    carriage return at the end of line.

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 258aff35cd8e59b5756ba83c6ecfb6acef194d82..e4c858d35be6e58926442e35212b362148cec54b 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE

-DEF_VER=v2.16.0-rc2
+DEF_VER=v2.16.0

 
 LF='
 '
 
 LF='
 '