@@ -70,6 +70,10 @@ UI, Workflows & Features
7070 * The new "--follow-tags" option tells "git push" to push relevant
7171 annotated tags when pushing branches out.
7272
73+ * "git merge" and "git pull" can optionally be told to inspect and
74+ reject when merging a commit that does not carry a trusted GPG
75+ signature.
76+
7377 * "git mergetool" now feeds files to the "p4merge" backend in the
7478 order that matches the p4 convention, where "theirs" is usually
7579 shown on the left side, which is the opposite from other backend
@@ -131,6 +135,14 @@ Unless otherwise noted, all the fixes since v1.8.2 in the maintenance
131135track are contained in this release (see release notes to them for
132136details).
133137
138+ * "git merge $(git rev-parse v1.8.2)" behaved quite differently from
139+ "git merge v1.8.2", as if v1.8.2 were written as v1.8.2^0 and did
140+ not pay much attention to the annotated tag payload. Make the code
141+ notice the type of the tag object, in addition to the dwim_ref()
142+ based classification the current code uses (i.e. the name appears
143+ in refs/tags/) to decide when to special case merging of tags.
144+ (merge a38d3d7 jc/merge-tag-object later to maint).
145+
134146 * Fix 1.8.1.x regression that stopped matching "dir" (without
135147 trailing slash) to a directory "dir".
136148 (merge efa5f82 jc/directory-attrs-regression-fix later to maint-1.8.1).
0 commit comments