Git 1.7.11-rc2

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

Junio C Hamano committed Jun 7, 2012 at 09:14 UTC a1a031d9356cc89cadc5e14acc4028e3ecc306eb
2 files changed +15 -12
Documentation/RelNotes/1.7.11.txt
+14 -11
@@ -18,10 +18,13 @@ UI, Workflows & Features
18
19 * A third-party tool "git subtree" is distributed in contrib/
20
21 + * A remote helper that acts as a proxy and caches ssl session for the
22 + https:// transport is added to the contrib/ area.
23 +
24 * Error messages given when @{u} is used for a branch without its
22 - upstream configured have been clatified.
25 + upstream configured have been clarified.
26
24 - * Even with "-q"uiet option, "checkout" used to report setting up
27 + * Even with the "-q"uiet option, "checkout" used to report setting up
28 tracking. Also "branch" learned the "-q"uiet option to squelch
29 informational message.
30
@@ -37,8 +40,8 @@ UI, Workflows & Features
40 * "git am" learned the "--include" option, which is an opposite of
41 existing the "--exclude" option.
42
40 - * When "git am -3" needs to fall back to an application to a
41 - synthesized preimage followed by a 3-way merge, the paths that
43 + * When "git am -3" needs to fall back to an application of the patch
44 + to a synthesized preimage followed by a 3-way merge, the paths that
45 needed such treatment are now reported to the end user, so that the
46 result in them can be eyeballed with extra care.
47
@@ -50,7 +53,7 @@ UI, Workflows & Features
53 after populating two temporary directories, instead of running an
54 instance of the external tool once per a file pair.
55
53 - * The "fmt-merge-msg" command learns to list the primary contributors
56 + * The "fmt-merge-msg" command learned to list the primary contributors
57 involved in the side topic you are merging.
58
59 * "git rebase" learned to optionally keep commits that do not
@@ -67,15 +70,15 @@ UI, Workflows & Features
70
71 Foreign Interface
72
70 - * "git svn" used to die with unwanted SIGPIPE when talking with HTTP
73 + * "git svn" used to die with unwanted SIGPIPE when talking with an HTTP
74 server that uses keep-alive.
75
76 * "git svn" learned to use platform specific authentication
77 providers, e.g. gnome-keyring, kwallet, etc.
78
76 - * "git p4" has been moved out of contrib/ area and has seen more work
77 - on importing labels as tags from (and exporting tags as labels to)
78 - p4.
79 + * "git p4" has been moved out of the contrib/ area and has seen more
80 + work on importing labels as tags from (and exporting tags as labels
81 + to) p4.
82
83 Performance and Internal Implementation (please report possible regressions)
84
@@ -113,8 +116,8 @@ Performance and Internal Implementation (please report possible regressions)
116 systems, run-command API now uses SHELL_PATH, not /bin/sh, when
117 spawning an external command (not applicable to Windows port).
118
116 - * The API to iterate over refs/ hierarchy has been tweaked to allow
117 - walking only a subset of it more efficiently.
119 + * The API to iterate over the refs/ hierarchy has been tweaked to
120 + allow walking only a subset of it more efficiently.
121
122 Also contains minor documentation updates and code clean-ups.
123
GIT-VERSION-GEN
+1 -1
@@ -1,7 +1,7 @@
1 #!/bin/sh
2
3 GVF=GIT-VERSION-FILE
4 -DEF_VER=v1.7.11-rc1
4 +DEF_VER=v1.7.11-rc2
5
6 LF='
7 '