Fifth batch for 2.11
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Sep 26, 2016 at 16:11 UTC
21f862b498925194f8f1ebe8203b7a7df756555b
1 file changed
+66
Documentation/RelNotes/2.11.0.txt
+66
@@ -38,6 +38,22 @@ UI, Workflows & Features
38
lacked an equivalent mechanism to run the "Git-to-outside-world"
39
conversion. The command learned the "--filters" option to do so.
40
41
+ * Output from "git diff" can be made easier to read by selecting
42
+ which lines are common and which lines are added/deleted
43
+ intelligently when the lines before and after the changed section
44
+ are the same. A command line option is added to help with the
45
+ experiment to find a good heuristics.
46
+
47
+ * In some projects, it is common to use "[RFC PATCH]" as the subject
48
+ prefix for a patch meant for discussion rather than application. A
49
+ new option "--rfc" was a short-hand for "--subject-prefix=RFC PATCH"
50
+ to help the participants of such projects.
51
+
52
+ * "git add --chmod=+x <pathspec>" added recently only toggled the
53
+ executable bit for paths that are either new or modified. This has
54
+ been corrected to flip the executable bit for all paths that match
55
+ the given pathspec.
56
+
57
58
Performance, Internal Implementation, Development Support etc.
59
@@ -196,9 +212,59 @@ notes for details).
212
50.
213
(merge 07e7dbf jk/reduce-gc-aggressive-depth later to maint).
214
215
+ * Documentation for individual configuration variables to control use
216
+ of color (like `color.grep`) said that their default value is
217
+ 'false', instead of saying their default is taken from `color.ui`.
218
+ When we updated the default value for color.ui from 'false' to
219
+ 'auto' quite a while ago, all of them broke. This has been
220
+ corrected.
221
+ (merge 14d16e2 mm/config-color-ui-default-to-auto later to maint).
222
+
223
+ * The pretty-format specifier "%C(auto)" used by the "log" family of
224
+ commands to enable coloring of the output is taught to also issue a
225
+ color-reset sequence to the output.
226
+ (merge c99ad27 rs/c-auto-resets-attributes later to maint).
227
+
228
+ * A shell script example in check-ref-format documentation has been
229
+ fixed.
230
+ (merge 92dece7 ep/doc-check-ref-format-example later to maint).
231
+
232
+ * "git checkout <word>" does not follow the usual disambiguation
233
+ rules when the <word> can be both a rev and a path, to allow
234
+ checking out a branch 'foo' in a project that happens to have a
235
+ file 'foo' in the working tree without having to disambiguate.
236
+ This was poorly documented and the check was incorrect when the
237
+ command was run from a subdirectory.
238
+ (merge b829b94 nd/checkout-disambiguation later to maint).
239
+
240
+ * Some codepaths in "git diff" used regexec(3) on a buffer that was
241
+ mmap(2)ed, which may not have a terminating NUL, leading to a read
242
+ beyond the end of the mapped region. This was fixed by introducing
243
+ a regexec_buf() helper that takes a <ptr,len> pair with REG_STARTEND
244
+ extension.
245
+ (merge b7d36ff js/regexec-buf later to maint).
246
+
247
+ * The procedure to build Git on Mac OS X for Travis CI hardcoded the
248
+ internal directory structure we assumed HomeBrew uses, which was a
249
+ no-no. The procedure has been updated to ask HomeBrew things we
250
+ need to know to fix this.
251
+ (merge f86f49b ls/travis-homebrew-path-fix later to maint).
252
+
253
+ * When "git rebase -i" is given a broken instruction, it told the
254
+ user to fix it with "--edit-todo", but didn't say what the step
255
+ after that was (i.e. "--continue").
256
+ (merge 37875b4 rt/rebase-i-broken-insn-advise later to maint).
257
+
258
+ * Documentation around tools to import from CVS was fairly outdated.
259
+ (merge 106b672 jk/doc-cvs-update later to maint).
260
+
261
+ * "git clone --recurse-submodules" lost the progress eye-candy in
262
+ recent update, which has been corrected.
263
+
264
* Other minor doc, test and build updates and code cleanups.
265
(merge e78d57e bw/pathspec-remove-unused-extern-decl later to maint).
266
(merge ce25e4c rs/checkout-some-states-are-const later to maint).
267
(merge a8342a4 rs/strbuf-remove-fix later to maint).
268
(merge b56aa5b rs/unpack-trees-reduce-file-scope-global later to maint).
269
(merge 5efc60c mr/vcs-svn-printf-ulong later to maint).
270
+ (merge a22ae75 rs/cocci later to maint).