Git 1.7.10-rc4

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

diff --git a/Documentation/RelNotes/1.7.10.txt b/Documentation/RelNotes/1.7.10.txt
index d326ff84955656cd1546c940755a0f8d7fb8aa6a..fed9c73f08dc68cb3f143b468862f1ebb1439a4b 100644 (file)
--- a/Documentation/RelNotes/1.7.10.txt
+++ b/Documentation/RelNotes/1.7.10.txt
@@ -32,12 +32,12 @@ Compatibility Notes
  * When you do not tell which branches and tags to push to the "git push"
    command in any way, the command used "matching refs" rule to update
    remote branches and tags with branches and tags with the same name you
  * When you do not tell which branches and tags to push to the "git push"
    command in any way, the command used "matching refs" rule to update
    remote branches and tags with branches and tags with the same name you

-   locally have.  In future versions of Git, this will change to use the
-   "upstream" rule to update the branch at the remote you would "pull"
-   from into your current branch with your local current branch.  The
-   release after 1.7.10 will start issuing a warning about this change,
-   to encourage you to tell the command what to push out, e.g. by setting
-   push.default configuration.
+   locally have.  In future versions of Git, this will change to push out
+   only your current branch according to either the "upstream" or the
+   "current" rule.  Although "upstream" may be more powerful once the
+   user understands Git better, the semantics "current" gives is
+   simpler and easier to understand for beginners and may be a safer
+   and better default option, but we haven't decided yet.

 
 
 Updates since v1.7.9
 
 
 Updates since v1.7.9


@@ -58,7 +58,7 @@ UI, Workflows & Features
  * Teams for localizing the messages from the Porcelain layer of
    commands are starting to form, thanks to Jiang Xin who volunteered
    to be the localization coordinator.  Translated messages for
  * Teams for localizing the messages from the Porcelain layer of
    commands are starting to form, thanks to Jiang Xin who volunteered
    to be the localization coordinator.  Translated messages for

-   simplified Chinese and Swedish are available.
+   simplified Chinese, Swedish and Portuguese are available.

 
  * The configuration mechanism learned an "include" facility; an
    assignment to the include.path pseudo-variable causes the named
 
  * The configuration mechanism learned an "include" facility; an
    assignment to the include.path pseudo-variable causes the named

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 52d52eb74fab91b56e4f4ccf10e029e261591591..57658cd953354b004b02c45cf37d716d14e36b73 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.7.10-rc3
+DEF_VER=v1.7.10-rc4

 
 LF='
 '
 
 LF='
 '