Git 1.8.4-rc0

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

diff --git a/Documentation/RelNotes/1.8.4.txt b/Documentation/RelNotes/1.8.4.txt
index ad58ac6dbd75d68c7ff800a5af79407c61c918eb..b4f8737c5a494efeac5d8a901cb1bad46ba8c9f1 100644 (file)
--- a/Documentation/RelNotes/1.8.4.txt
+++ b/Documentation/RelNotes/1.8.4.txt
@@ -48,6 +48,8 @@ Updates since v1.8.3
 
 Foreign interfaces, subsystems and ports.
 
 
 Foreign interfaces, subsystems and ports.
 

+ * Cygwin port has been updated for more recent Cygwin 1.7.
+

  * "git rebase -i" now honors --strategy and -X options.
 
  * Git-gui has been updated to its 0.18.0 version.
  * "git rebase -i" now honors --strategy and -X options.
 
  * Git-gui has been updated to its 0.18.0 version.


@@ -83,6 +85,12 @@ Foreign interfaces, subsystems and ports.
 
 UI, Workflows & Features
 
 
 UI, Workflows & Features
 

+ * Sample "post-receive-email" hook script got an enhanced replacement
+   "multimail" (in contrib/).
+
+ * Also in contrib/ is a new "contacts" script that runs "git blame"
+   to find out the people who may be interested in a set of changes.
+

  * "git clean" command learned an interactive mode.
 
  * The "--head" option to "git show-ref" was only to add "HEAD" to the
  * "git clean" command learned an interactive mode.
 
  * The "--head" option to "git show-ref" was only to add "HEAD" to the


@@ -182,7 +190,7 @@ UI, Workflows & Features
    directly uses the 40-hex string as an object name, even if a ref
    "refs/<some hierarchy>/<name>" exists.  This disambiguation order
    is unlikely to change, but we should warn about the ambiguity just
    directly uses the 40-hex string as an object name, even if a ref
    "refs/<some hierarchy>/<name>" exists.  This disambiguation order
    is unlikely to change, but we should warn about the ambiguity just

-   like we warn when more than one refs/ hierachies share the same
+   like we warn when more than one refs/ hierarchies share the same

    name.
 
  * "git rebase" learned "--[no-]autostash" option to save local
    name.
 
  * "git rebase" learned "--[no-]autostash" option to save local

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index b4d4e5045fc78173c77de6de3fb9330de49a9628..2c109111e3e2a3a76126f25ad3eadec275682c4d 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=v1.8.3.GIT
+DEF_VER=v1.8.4-rc0

 
 LF='
 '
 
 LF='
 '