Seventh batch for 2.17
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Mar 6, 2018 at 14:59 UTC
c6284da4ff4afbde8211efe5d03f3604b1c6b9d6
1 file changed
+50
Documentation/RelNotes/2.17.0.txt
+50
@@ -26,6 +26,34 @@ UI, Workflows & Features
26
* "git worktree add" learned to run the post-checkout hook, just like
27
"git clone" runs it upon the initial checkout.
28
29
+ * "git tag" learned an explicit "--edit" option that allows the
30
+ message given via "-m" and "-F" to be further edited.
31
+
32
+ * "git fetch --prune-tags" may be used as a handy short-hand for
33
+ getting rid of stale tags that are locally held.
34
+
35
+ * The new "--show-current-patch" option gives an end-user facing way
36
+ to get the diff being applied when "git rebase" (and "git am")
37
+ stops with a conflict.
38
+
39
+ * "git add -p" used to offer "/" (look for a matching hunk) as a
40
+ choice, even there was only one hunk, which has been corrected.
41
+ Also the single-key help is now given only for keys that are
42
+ enabled (e.g. help for '/' won't be shown when there is only one
43
+ hunk).
44
+
45
+ * Since Git 1.7.9, "git merge" defaulted to --no-ff (i.e. even when
46
+ the side branch being merged is a descendant of the current commit,
47
+ create a merge commit instead of fast-forwarding) when merging a
48
+ tag object. This was appropriate default for integrators who pull
49
+ signed tags from their downstream contributors, but caused an
50
+ unnecessary merges when used by downstream contributors who
51
+ habitually "catch up" their topic branches with tagged releases
52
+ from the upstream. Update "git merge" to default to --no-ff only
53
+ when merging a tag object that does *not* sit at its usual place in
54
+ refs/tags/ hierarchy, and allow fast-forwarding otherwise, to
55
+ mitigate the problem.
56
+
57
58
Performance, Internal Implementation, Development Support etc.
59
@@ -89,6 +117,12 @@ Performance, Internal Implementation, Development Support etc.
117
how the packfile is indexed with object names) has been refactored
118
into a reusable helper.
119
120
+ * We now avoid using identifiers that clash with C++ keywords. Even
121
+ though it is not a goal to compile Git with C++ compilers, changes
122
+ like this help use of code analysis tools that targets C++ on our
123
+ codebase.
124
+
125
+
126
Also contains various documentation updates and code clean-ups.
127
128
@@ -229,6 +263,14 @@ Fixes since v2.16
263
correctly.
264
(merge 90dce21eb0 jk/push-options-via-transport-fix later to maint).
265
266
+ * "git send-email" learned to complain when the batch-size option is
267
+ not defined when the relogin-delay option is, since these two are
268
+ mutually required.
269
+ (merge 9caa70697b xz/send-email-batch-size later to maint).
270
+
271
+ * Y2k20 fix ;-) for our perl scripts.
272
+ (merge a40e06ee33 bw/perl-timegm-timelocal-fix later to maint).
273
+
274
* Other minor doc, test and build updates and code cleanups.
275
(merge e2a5a028c7 bw/oidmap-autoinit later to maint).
276
(merge ec3b4b06f8 cl/t9001-cleanup later to maint).
@@ -255,3 +297,11 @@ Fixes since v2.16
297
(merge e4e5da2796 sb/status-doc-fix later to maint).
298
(merge 7976e901c8 gs/test-unset-xdg-cache-home later to maint).
299
(merge d023df1ee6 tg/worktree-create-tracking later to maint).
300
+ (merge 4cbe92fd41 sm/mv-dry-run-update later to maint).
301
+ (merge 75e5e9c3f7 sb/color-h-cleanup later to maint).
302
+ (merge 2708ef4af6 sg/t6300-modernize later to maint).
303
+ (merge d88e92d4e0 bw/doc-submodule-recurse-config-with-clone later to maint).
304
+ (merge f74bbc8dd2 jk/cached-commit-buffer later to maint).
305
+ (merge 1316416903 ms/non-ascii-ticks later to maint).
306
+ (merge 878056005e rs/strbuf-read-file-or-whine later to maint).
307
+ (merge 79f0ba1547 jk/strbuf-read-file-close-error later to maint).