Update draft release notes to 1.8.3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Apr 5, 2013 at 14:19 UTC
21ccebec0dd1d7e624ea2f22af6ac93686daf34f
1 file changed
+12
Documentation/RelNotes/1.8.3.txt
+12
@@ -70,6 +70,10 @@ UI, Workflows & Features
70
* The new "--follow-tags" option tells "git push" to push relevant
71
annotated tags when pushing branches out.
72
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
+
77
* "git mergetool" now feeds files to the "p4merge" backend in the
78
order that matches the p4 convention, where "theirs" is usually
79
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
135
track are contained in this release (see release notes to them for
136
details).
137
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
+
146
* Fix 1.8.1.x regression that stopped matching "dir" (without
147
trailing slash) to a directory "dir".
148
(merge efa5f82 jc/directory-attrs-regression-fix later to maint-1.8.1).