Fourth batch for 2.12
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Dec 27, 2016 at 09:17 UTC
e05806da9ec4aff8adfed142ab2a2b3b02e33c8c
1 file changed
+42
Documentation/RelNotes/2.12.0.txt
+42
@@ -43,6 +43,24 @@ UI, Workflows & Features
43
embedded in these clones of the submodules embedded in the clone of
44
the superproject.
45
46
+ * Porcelain scripts written in Perl are getting internationalized.
47
+
48
+ * "git merge --continue" has been added as a synonym to "git commit"
49
+ to conclude a merge that has stopped due to conflicts.
50
+
51
+ * Finer-grained control of what protocols are allowed for transports
52
+ during clone/fetch/push have been enabled via a new configuration
53
+ mechanism.
54
+
55
+ * "git shortlog" learned "--committer" option to group commits by
56
+ committer, instead of author.
57
+
58
+ * GitLFS integration with "git p4" has been updated.
59
+
60
+ * The isatty() emulation for Windows has been updated to eradicate
61
+ the previous hack that depended on internals of (older) MSVC
62
+ runtime.
63
+
64
65
Performance, Internal Implementation, Development Support etc.
66
@@ -202,6 +220,28 @@ notes for details).
220
* Fix for NDEBUG builds.
221
(merge 08414938a2 jt/mailinfo-fold-in-body-headers later to maint).
222
223
+ * A lazy "git push" without refspec did not internally use a fully
224
+ specified refspec to perform 'current', 'simple', or 'upstream'
225
+ push, causing unnecessary "ambiguous ref" errors.
226
+ (merge b284495e93 jc/push-default-explicit later to maint).
227
+
228
+ * "git p4" misbehaved when swapping a directory and a symbolic link.
229
+ (merge df8a9e86db ld/p4-compare-dir-vs-symlink later to maint).
230
+
231
+ * Even though an fix was attempted in Git 2.9.3 days, but running
232
+ "git difftool --dir-diff" from a subdirectory never worked. This
233
+ has been fixed.
234
+ (merge ce6926974e jk/difftool-in-subdir later to maint).
235
+
236
+ * "git p4" that tracks multile p4 paths imported a single changelist
237
+ that touches files in these multiple paths as one commit, followed
238
+ by many empty commits. This has been fixed.
239
+ (merge 9943e5b979 gv/p4-multi-path-commit-fix later to maint).
240
+
241
+ * A potential but unlikely buffer overflow in Windows port has been
242
+ fixed.
243
+ (merge c46458e82f mk/mingw-winansi-ttyname-termination-fix later to maint).
244
+
245
* Other minor doc, test and build updates and code cleanups.
246
(merge fa6ca11105 nd/qsort-in-merge-recursive later to maint).
247
(merge fa3142c919 ak/lazy-prereq-mktemp later to maint).
@@ -211,3 +251,5 @@ notes for details).
251
(merge 9e189f1a5c sb/t3600-cleanup later to maint).
252
(merge e2c20be57c lr/doc-fix-cet later to maint).
253
(merge 47437fd3bd kh/tutorial-grammofix later to maint).
254
+ (merge f2627d9b19 sb/submodule-config-cleanup later to maint).
255
+ (merge 7eeda8b821 ls/filter-process later to maint).