Git 1.7.10

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 fed9c73f08dc68cb3f143b468862f1ebb1439a4b..58100bf04e1c3b7e7f4440eb3df9696b3a5343df 100644 (file)
--- a/Documentation/RelNotes/1.7.10.txt
+++ b/Documentation/RelNotes/1.7.10.txt
@@ -19,7 +19,7 @@ Compatibility Notes
        GIT_MERGE_AUTOEDIT=no
        export GIT_MERGE_AUTOEDIT
 
        GIT_MERGE_AUTOEDIT=no
        export GIT_MERGE_AUTOEDIT
 

-   to disable this behaviour (if you want your users to explain their
+   to disable this behavior (if you want your users to explain their

    merge commits, you do not have to do anything).  Alternatively, you
    can give the "--no-edit" option to individual invocations of the
    "git merge" command if you know everybody who uses your script has
    merge commits, you do not have to do anything).  Alternatively, you
    can give the "--no-edit" option to individual invocations of the
    "git merge" command if you know everybody who uses your script has


@@ -29,15 +29,16 @@ Compatibility Notes
    while and were deprecated in mid 2008 (v1.6.0).  When you give these
    options to "git am", it will now warn and ask you not to use them.
 
    while and were deprecated in mid 2008 (v1.6.0).  When you give these
    options to "git am", it will now warn and ask you not to use them.
 

- * 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 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.
+ * 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 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.  We haven't decided
+   yet which one to switch to.

 
 
 Updates since v1.7.9
 
 
 Updates since v1.7.9


@@ -139,6 +140,8 @@ UI, Workflows & Features
  * Project search in "gitweb" shows the substring that matched in the
    project name and description highlighted.
 
  * Project search in "gitweb" shows the substring that matched in the
    project name and description highlighted.
 

+ * HTTP transport learned to authenticate with a proxy if needed.
+

  * A new script "diffall" is added to contrib/; it drives an
    external tool to perform a directory diff of two Git revisions
    in one go, unlike "difftool" that compares one file at a time.
  * A new script "diffall" is added to contrib/; it drives an
    external tool to perform a directory diff of two Git revisions
    in one go, unlike "difftool" that compares one file at a time.

diff --git a/Documentation/git.txt b/Documentation/git.txt
index ae34e8a7f6b34d81550f0adf60098b075e8b7757..ca85d1d210dc6015fef205e543f34b6f25733fca 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -44,6 +44,11 @@ unreleased) version of git, that is available from 'master'
 branch of the `git.git` repository.
 Documentation for older releases are available here:
 
 branch of the `git.git` repository.
 Documentation for older releases are available here:
 

+* link:v1.7.10/git.html[documentation for release 1.7.10]
+
+* release notes for
+  link:RelNotes/1.7.10.txt[1.7.10].
+

 * link:v1.7.9.6/git.html[documentation for release 1.7.9.6]
 
 * release notes for
 * link:v1.7.9.6/git.html[documentation for release 1.7.9.6]
 
 * release notes for

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

 
 LF='
 '
 
 LF='
 '