Update draft release notes to 2.2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Oct 21, 2014 at 13:35 UTC
19b5d50cb15637f20b9cce01806b3a256491d613
1 file changed
+17
-4
Documentation/RelNotes/2.2.0.txt
+17
-4
@@ -42,6 +42,15 @@ UI, Workflows & Features
42
forgot to remove higher stage entries, or if it wanted to unresolve
43
and forgot to remove the stage#0 entry).
44
45
+ * The temporary files "git mergetool" uses are named to avoid too
46
+ many dots in them (e.g. a temporary file for "hello.c" used to be
47
+ named e.g. "hello.BASE.4321.c" but now uses underscore instead,
48
+ e.g. "hello_BASE_4321.c").
49
+
50
+ * The temporary files "git mergetools" uses can be placed in a newly
51
+ creted temporary directory, instead of the current directory, by
52
+ setting the mergetool.writeToTemp configuration variable.
53
+
54
* The "pre-receive" and "post-receive" hooks are no longer required
55
to consume their input fully (not following this requirement used
56
to result in intermittent errors in "git push").
@@ -68,10 +77,10 @@ UI, Workflows & Features
77
78
Performance, Internal Implementation, etc.
79
71
- * The API to manipulate the "refs" is currently undergoing a revamp
72
- to make it more transactional, with the eventual goal to allow
73
- all-or-none atomic updates and migrating the storage to something
74
- other than the traditional filesystem based one (e.g. databases).
80
+ * The API to manipulate the "refs" has been restructured to make it
81
+ more transactional, with the eventual goal to allow all-or-none
82
+ atomic updates and migrating the storage to something other than
83
+ the traditional filesystem based one (e.g. databases).
84
85
* The lockfile API and its users have been cleaned up.
86
@@ -248,3 +257,7 @@ notes for details).
257
* "gitweb" used deprecated CGI::startfrom, which was removed from
258
CGI.pm as of 4.04; use CGI::start_from instead.
259
(merge 4750f4b rm/gitweb-start-form later to maint).
260
+
261
+ * Newer versions of 'meld' breaks the auto-detection we use to see if
262
+ they are new enough to support the `--output` option.
263
+ (merge b12d045 da/mergetool-meld later to maint).