Eighth batch for 2.5
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Jun 16, 2015 at 14:39 UTC
16da57c7c6c1fe92b32645202dd19657a89dd67d
1 file changed
+11
-1
Documentation/RelNotes/2.5.0.txt
+11
-1
@@ -120,6 +120,9 @@ UI, Workflows & Features
120
behaves as if HEAD:Documentation/RelNotes/2.5.0.txt was given as
121
input instead.
122
123
+ * "git send-email" learned the alias file format used by the sendmail
124
+ program (in an abbreviated form).
125
+
126
127
Performance, Internal Implementation, Development Support etc.
128
@@ -197,7 +200,7 @@ notes for details).
200
201
* Memory usage of "git index-pack" has been trimmed by tens of
202
per-cent.
200
- (merge c6458e6 nd/slim-index-pack-memory-usage later to maint).
203
+ (merge a78c5b3 nd/slim-index-pack-memory-usage later to maint).
204
205
* "git rev-list --objects $old --not --all" to see if everything that
206
is reachable from $old is already connected to the existing refs
@@ -415,6 +418,10 @@ notes for details).
418
a more logical synonym.
419
(merge 8dbf3eb jk/color-diff-plain-is-context later to maint).
420
421
+ * The setup code used to die when core.bare and core.worktree are set
422
+ inconsistently, even for commands that do not need working tree.
423
+ (merge fada767 jk/die-on-bogus-worktree-late later to maint).
424
+
425
* Code cleanups and documentation updates.
426
(merge 0269f96 mm/usage-log-l-can-take-regex later to maint).
427
(merge 64f2589 nd/t1509-chroot-test later to maint).
@@ -433,3 +440,6 @@ notes for details).
440
(merge e6a268c sb/glossary-submodule later to maint).
441
(merge ec48a76 sb/submodule-doc-intro later to maint).
442
(merge 14f8b9b jk/clone-dissociate later to maint).
443
+ (merge 055c7e9 sb/pack-protocol-mention-smart-http later to maint).
444
+ (merge 7c37a5d jk/make-fix-dependencies later to maint).
445
+ (merge fc0aa39 sg/merge-summary-config later to maint).