Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Update draft release notes to 2.2
author
Junio C Hamano
<gitster@pobox.com>
Tue, 21 Oct 2014 20:35:44 +0000
(13:35 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 21 Oct 2014 20:35:44 +0000
(13:35 -0700)
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/RelNotes/2.2.0.txt
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
693f62f
)
diff --git
a/Documentation/RelNotes/2.2.0.txt
b/Documentation/RelNotes/2.2.0.txt
index af876e2ce998762071cbddf2adbb845eb8d90f37..8d413feb8c242bb1a783cd69cad5c5d04c3ba395 100644
(file)
--- a/
Documentation/RelNotes/2.2.0.txt
+++ b/
Documentation/RelNotes/2.2.0.txt
@@
-42,6
+42,15
@@
UI, Workflows & Features
forgot to remove higher stage entries, or if it wanted to unresolve
and forgot to remove the stage#0 entry).
forgot to remove higher stage entries, or if it wanted to unresolve
and forgot to remove the stage#0 entry).
+ * The temporary files "git mergetool" uses are named to avoid too
+ many dots in them (e.g. a temporary file for "hello.c" used to be
+ named e.g. "hello.BASE.4321.c" but now uses underscore instead,
+ e.g. "hello_BASE_4321.c").
+
+ * The temporary files "git mergetools" uses can be placed in a newly
+ creted temporary directory, instead of the current directory, by
+ setting the mergetool.writeToTemp configuration variable.
+
* The "pre-receive" and "post-receive" hooks are no longer required
to consume their input fully (not following this requirement used
to result in intermittent errors in "git push").
* The "pre-receive" and "post-receive" hooks are no longer required
to consume their input fully (not following this requirement used
to result in intermittent errors in "git push").
@@
-68,10
+77,10
@@
UI, Workflows & Features
Performance, Internal Implementation, etc.
Performance, Internal Implementation, etc.
- * The API to manipulate the "refs"
is currently undergoing a revamp
- to make it more transactional, with the eventual goal to allow
- a
ll-or-none atomic updates and migrating the storage to something
-
other than
the traditional filesystem based one (e.g. databases).
+ * The API to manipulate the "refs"
has been restructured to make it
+ more transactional, with the eventual goal to allow all-or-none
+ a
tomic updates and migrating the storage to something other than
+ the traditional filesystem based one (e.g. databases).
* The lockfile API and its users have been cleaned up.
* The lockfile API and its users have been cleaned up.
@@
-248,3
+257,7
@@
notes for details).
* "gitweb" used deprecated CGI::startfrom, which was removed from
CGI.pm as of 4.04; use CGI::start_from instead.
(merge 4750f4b rm/gitweb-start-form later to maint).
* "gitweb" used deprecated CGI::startfrom, which was removed from
CGI.pm as of 4.04; use CGI::start_from instead.
(merge 4750f4b rm/gitweb-start-form later to maint).
+
+ * Newer versions of 'meld' breaks the auto-detection we use to see if
+ they are new enough to support the `--output` option.
+ (merge b12d045 da/mergetool-meld later to maint).