Git 2.2.0-rc3

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

Junio C Hamano committed Nov 21, 2014 at 12:10 UTC 652e759330da379a8e09e03bbf99e03c10c228cc
2 files changed +15 -14
Documentation/RelNotes/2.2.0.txt
+14 -13
@@ -28,7 +28,7 @@ UI, Workflows & Features
28 * "git stash list -p" used to be almost always a no-op because each
29 stash entry is represented as a merge commit. It learned to show
30 the difference between the base commit version and the working tree
31 - version, which is in line with what "git show" gives.
31 + version, which is in line with what "git stash show" gives.
32
33 * Sometimes users want to report a bug they experience on their
34 repository, but they are not at liberty to share the contents of
@@ -59,15 +59,15 @@ UI, Workflows & Features
59 * The temporary files "git mergetool" uses are named to avoid too
60 many dots in them (e.g. a temporary file for "hello.c" used to be
61 named e.g. "hello.BASE.4321.c" but now uses underscore instead,
62 - e.g. "hello_BASE_4321.c").
62 + e.g. "hello_BASE_4321.c", to allow us to have multiple variants).
63
64 - * The temporary files "git mergetools" uses can be placed in a newly
64 + * The temporary files "git mergetool" uses can be placed in a newly
65 created temporary directory, instead of the current directory, by
66 setting the mergetool.writeToTemp configuration variable.
67
68 * "git mergetool" understands "--tool bc" now, as version 4 of
69 BeyondCompare can be driven the same way as its version 3 and it
70 - feels awkward to say "--tool bc3".
70 + feels awkward to say "--tool bc3" to run version 4.
71
72 * The "pre-receive" and "post-receive" hooks are no longer required
73 to consume their input fully (not following this requirement used
@@ -86,17 +86,17 @@ UI, Workflows & Features
86 without having to "trust" the server.
87
88 * "git interpret-trailers" is a new filter to programmatically edit
89 - the tail end of the commit log messages.
89 + the tail end of the commit log messages, e.g. "Signed-off-by:".
90
91 * "git help everyday" shows the "Everyday Git in 20 commands or so"
92 - document, whose contents have been updated to more modern Git
93 - practice.
92 + document, whose contents have been updated to match more modern
93 + Git practice.
94
95 * On the "git svn" front, work to reduce memory consumption and
96 to improve handling of mergeinfo progresses.
97
98
99 -Performance, Internal Implementation, etc.
99 +Performance, Internal Implementation, Development Support etc.
100
101 * The API to manipulate the "refs" has been restructured to make it
102 more transactional, with the eventual goal to allow all-or-none
@@ -118,8 +118,8 @@ Performance, Internal Implementation, etc.
118
119 * There are cases where you lock and open to write a file, close it
120 to show the updated contents to external processes, and then have
121 - to update the file again while still holding the lock, but the
122 - lockfile API lacked support for such an access pattern.
121 + to update the file again while still holding the lock; now the
122 + lockfile API has support for such an access pattern.
123
124 * The API to allocate the structure to keep track of commit
125 decoration has been updated to make it less cumbersome to use.
@@ -166,12 +166,13 @@ Performance, Internal Implementation, etc.
166 a shell-trace of each command run in them.
167
168 * The "run-command" API learned to manage the argv and environment
169 - array for child process, alleviating the need for the callers to
169 + arrays for child process, alleviating the need for the callers to
170 allocate and deallocate them.
171
172 * Some people use AsciiDoctor, instead of AsciiDoc, to format our
173 - documentation set; the documentation has been adjusted, as
174 - AsciiDoctor is pickier than AsciiDoc in its input mark-up.
173 + documentation set; the documentation has been adjusted to be usable
174 + by both, as AsciiDoctor is pickier than AsciiDoc in its input
175 + mark-up.
176
177
178 Also contains various documentation updates and code clean-ups.
GIT-VERSION-GEN
+1 -1
@@ -1,7 +1,7 @@
1 #!/bin/sh
2
3 GVF=GIT-VERSION-FILE
4 -DEF_VER=v2.2.0-rc2
4 +DEF_VER=v2.2.0-rc3
5
6 LF='
7 '