Seventh batch for 2.21

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Junio C Hamano committed Feb 8, 2019 at 20:45 UTC 11ad41d4cb25a41b21a7343c495aceb38d4db4d8
1 file changed +13 -1
Documentation/RelNotes/2.21.0.txt
+13 -1
@@ -35,7 +35,8 @@ UI, Workflows & Features
35 * "git checkout [<tree-ish>] path..." learned to report the number of
36 paths that have been checked out of the index or the tree-ish,
37 which gives it the same degree of noisy-ness as the case in which
38 - the command checks out a branch.
38 + the command checks out a branch. "git checkout -m <pathspec>" to
39 + undo conflict resolution gives a similar message.
40
41 * "git quiltimport" learned "--keep-non-patch" option.
42
@@ -174,6 +175,11 @@ Performance, Internal Implementation, Development Support etc.
175 * Use of the sparse tool got easier to customize from the command
176 line to help developers.
177
178 + * A new target "coverage-prove" to run the coverage test under
179 + "prove" has been added.
180 +
181 + * A flakey "p4" test has been removed.
182 +
183
184 Fixes since v2.20
185 -----------------
@@ -403,6 +409,9 @@ Fixes since v2.20
409 repository information correctly, leading to an access of freed
410 piece of memory.
411
412 + * Some errors from the other side coming over smart HTTP transport
413 + were not noticed, which has been corrected.
414 +
415 * Code cleanup, docfix, build fix, etc.
416 (merge 89ba9a79ae hb/t0061-dot-in-path-fix later to maint).
417 (merge d173e799ea sb/diff-color-moved-config-option-fixup later to maint).
@@ -427,3 +436,6 @@ Fixes since v2.20
436 (merge 86fb1c4e77 km/init-doc-typofix later to maint).
437 (merge 5cfd4a9d10 nd/commit-doc later to maint).
438 (merge 9fce19a431 ab/diff-tree-doc-fix later to maint).
439 + (merge 2e285e7803 tz/gpg-test-fix later to maint).
440 + (merge 5427de960b kl/pretty-doc-markup-fix later to maint).
441 + (merge 3815f64b0d js/mingw-host-cpu later to maint).