Sixth batch for 2.1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Jul 9, 2014 at 11:54 UTC
81e776d92bb19a4fab12dcc537adfd543468d7d0
1 file changed
+18
Documentation/RelNotes/2.1.0.txt
+18
@@ -111,6 +111,9 @@ Performance, Internal Implementation, etc.
111
112
* Build procedure for 'subtree' (in contrib/) has been cleaned up.
113
114
+ * Patches maintained by msysgit folks for Windows port are being
115
+ upstreamed here a bit by bit.
116
+
117
* The `core.deltabasecachelimit` used to default to 16 MiB , but this
118
proved to be too small, and has been bumped to 96 MiB.
119
@@ -173,6 +176,17 @@ notes for details).
176
columns are different.
177
(merge 7d50987 as/pretty-truncate later to maint).
178
179
+ * "%G" (nothing after G) is an invalid pretty format specifier, but
180
+ the parser did not notice it as garbage.
181
+ (merge 958b2eb jk/pretty-G-format-fixes later to maint).
182
+
183
+ * A handful of code paths had to read the commit object more than
184
+ once when showing header fields that are usually not parsed. The
185
+ internal data structure to keep track of the contents of the commit
186
+ object has been updated to reduce the need for this double-reading,
187
+ and to allow the caller find the length of the object.
188
+ (merge 218aa3a jk/commit-buffer-length later to maint).
189
+
190
* The "mailmap.file" configuration option did not support the tilde
191
expansion (i.e. ~user/path and ~/path).
192
(merge 9352fd5 ow/config-mailmap-pathname later to maint).
@@ -270,6 +284,10 @@ notes for details).
284
emptying the insn sheet.
285
(merge ddb5432 rr/rebase-autostash-fix later to maint).
286
287
+ * During "git rebase --merge", a conflicted patch could not be
288
+ skipped with "--skip" if the next one also conflicted.
289
+ (merge 95104c7 bc/fix-rebase-merge-skip later to maint).
290
+
291
* "git show -s" (i.e. show log message only) used to incorrectly emit
292
an extra blank line after a merge commit.
293
(merge ad2f725 mk/show-s-no-extra-blank-line-for-merges later to maint).