Eighth batch for 2.1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Jul 16, 2014 at 11:47 UTC
fb46e0c54535d009b173a1c9758b9c192dc3efff
1 file changed
+31
-1
Documentation/RelNotes/2.1.0.txt
+31
-1
@@ -93,7 +93,8 @@ UI, Workflows & Features
93
users need to explicitly set the variable to 'true' if they want
94
to resurrect the now-ignored use case.
95
96
- * "git replace" learned the "--edit" subcommand.
96
+ * "git replace" learned the "--edit" subcommand to create a
97
+ replacement by editing an existing object.
98
99
* "git send-email" learned "--to-cover" and "--cc-cover" options, to
100
tell it to copy To: and Cc: headers found in the first input file
@@ -115,6 +116,11 @@ Performance, Internal Implementation, etc.
116
117
* Build procedure for 'subtree' (in contrib/) has been cleaned up.
118
119
+ * An experimental format to use two files (the base file and
120
+ incremental changes relative to it) to represent the index has been
121
+ introduced; this may reduce I/O cost of rewriting a large index
122
+ when only small part of the working tree changes.
123
+
124
* Effort to shrink the size of patches Windows folks maintain on top
125
by upstreaming them continues.
126
@@ -141,6 +147,9 @@ Performance, Internal Implementation, etc.
147
example, "update-ref --stdin [-z]" has been updated to use this
148
API.
149
150
+ * skip_prefix() and strip_suffix() API functions are used a lot more
151
+ widely throughout the codebase now.
152
+
153
* Parts of the test scripts can be skipped by using a range notation,
154
e.g. "sh t1234-test.sh --run='1-4 6 8-'" to omit test piece 5 and 7
155
and run everything else.
@@ -213,6 +222,10 @@ notes for details).
222
couple of options unique to "git merge".
223
(merge 8fee872 jk/complete-merge-pull later to maint).
224
225
+ * An ancient rewrite passed a wrong pointer to a curl library
226
+ function in a rarely used code path.
227
+ (merge 479eaa8 ah/fix-http-push later to maint).
228
+
229
* "--ignore-space-change" option of "git apply" ignored the spaces
230
at the beginning of line too aggressively, which is inconsistent
231
with the option of the same name "diff" and "git diff" have.
@@ -242,6 +255,11 @@ notes for details).
255
bit.
256
(merge 5304810 jk/diff-files-assume-unchanged later to maint).
257
258
+ * "filter-branch" left an empty single-parent commit that results when
259
+ all parents of a merge commit gets mapped to the same commit, even
260
+ under "--prune-empty".
261
+ (merge 79bc4ef cb/filter-branch-prune-empty-degenerate-merges later to maint).
262
+
263
* "git format-patch" did not enforce the rule that the "--follow"
264
option from the log/diff family of commands must be used with
265
exactly one pathspec.
@@ -267,6 +285,13 @@ notes for details).
285
distinguish missing objects from type errors.
286
(merge 77583e7 jk/index-pack-report-missing later to maint).
287
288
+ * "log --show-signature" incorrectly decided the color to paint a
289
+ mergetag that was and was not correctly validated.
290
+ (merge 42c55ce mg/fix-log-mergetag-color later to maint).
291
+
292
+ * "log --show-signature" did not pay attention to "--graph" option.
293
+ (merge cf3983d zk/log-graph-showsig later to maint).
294
+
295
* "git mailinfo" used to read beyond the end of header string while
296
parsing an incoming e-mail message to extract the patch.
297
(merge b1a013d rs/mailinfo-header-cmp later to maint).
@@ -276,6 +301,11 @@ notes for details).
301
except for case differences.
302
(merge baa37bf dt/merge-recursive-case-insensitive later to maint).
303
304
+ * Merging changes into a file that ends in an incomplete line made the
305
+ last line into a complete one, even when the other branch did not
306
+ change anything around the end of file.
307
+ (merge ba31180 mk/merge-incomplete-files later to maint).
308
+
309
* "git pack-objects" unnecessarily copied the previous contents when
310
extending the hashtable, even though it will populate the table
311
from scratch anyway.