Git 1.7.11-rc2

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

diff --git a/Documentation/RelNotes/1.7.11.txt b/Documentation/RelNotes/1.7.11.txt
index f74adcc0be38a4cb5e77c52468218cea8756b458..a1f7994cec3ffa97cc81bf88236ce7d0f9621349 100644 (file)
--- a/Documentation/RelNotes/1.7.11.txt
+++ b/Documentation/RelNotes/1.7.11.txt
@@ -18,10 +18,13 @@ UI, Workflows & Features
 
  * A third-party tool "git subtree" is distributed in contrib/
 
+ * A remote helper that acts as a proxy and caches ssl session for the
+   https:// transport is added to the contrib/ area.
+
  * Error messages given when @{u} is used for a branch without its
-   upstream configured have been clatified.
+   upstream configured have been clarified.
 
- * Even with "-q"uiet option, "checkout" used to report setting up
+ * Even with the "-q"uiet option, "checkout" used to report setting up
    tracking.  Also "branch" learned the "-q"uiet option to squelch
    informational message.
 
@@ -37,8 +40,8 @@ UI, Workflows & Features
  * "git am" learned the "--include" option, which is an opposite of
    existing the "--exclude" option.
 
- * When "git am -3" needs to fall back to an application to a
-   synthesized preimage followed by a 3-way merge, the paths that
+ * When "git am -3" needs to fall back to an application of the patch
+   to a synthesized preimage followed by a 3-way merge, the paths that
    needed such treatment are now reported to the end user, so that the
    result in them can be eyeballed with extra care.
 
@@ -50,7 +53,7 @@ UI, Workflows & Features
    after populating two temporary directories, instead of running an
    instance of the external tool once per a file pair.
 
- * The "fmt-merge-msg" command learns to list the primary contributors
+ * The "fmt-merge-msg" command learned to list the primary contributors
    involved in the side topic you are merging.
 
  * "git rebase" learned to optionally keep commits that do not
@@ -67,15 +70,15 @@ UI, Workflows & Features
 
 Foreign Interface
 
- * "git svn" used to die with unwanted SIGPIPE when talking with HTTP
+ * "git svn" used to die with unwanted SIGPIPE when talking with an HTTP
    server that uses keep-alive.
 
  * "git svn" learned to use platform specific authentication
    providers, e.g. gnome-keyring, kwallet, etc.
 
- * "git p4" has been moved out of contrib/ area and has seen more work
-   on importing labels as tags from (and exporting tags as labels to)
-   p4.
+ * "git p4" has been moved out of the contrib/ area and has seen more
+   work on importing labels as tags from (and exporting tags as labels
+   to) p4.
 
 Performance and Internal Implementation (please report possible regressions)
 
@@ -113,8 +116,8 @@ Performance and Internal Implementation (please report possible regressions)
    systems, run-command API now uses SHELL_PATH, not /bin/sh, when
    spawning an external command (not applicable to Windows port).
 
- * The API to iterate over refs/ hierarchy has been tweaked to allow
-   walking only a subset of it more efficiently.
+ * The API to iterate over the refs/ hierarchy has been tweaked to
+   allow walking only a subset of it more efficiently.
 
 Also contains minor documentation updates and code clean-ups.
 

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 955b02b48032db91d80d8009da28e1d15099c56c..a1f935e2b70d7b7805bf4832046356259551235f 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.7.11-rc1
+DEF_VER=v1.7.11-rc2
 
 LF='
 '