Update draft release notes to 1.8.3

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

diff --git a/Documentation/RelNotes/1.8.3.txt b/Documentation/RelNotes/1.8.3.txt
index 822c0596a93bc43890aee8782f3a161020256652..a05c70fe1d0bf45469aa2cf921505a941243203e 100644 (file)
--- a/Documentation/RelNotes/1.8.3.txt
+++ b/Documentation/RelNotes/1.8.3.txt
@@ -70,6 +70,10 @@ UI, Workflows & Features
  * The new "--follow-tags" option tells "git push" to push relevant
    annotated tags when pushing branches out.
 
  * The new "--follow-tags" option tells "git push" to push relevant
    annotated tags when pushing branches out.
 

+ * "git merge" and "git pull" can optionally be told to inspect and
+   reject when merging a commit that does not carry a trusted GPG
+   signature.
+

  * "git mergetool" now feeds files to the "p4merge" backend in the
    order that matches the p4 convention, where "theirs" is usually
    shown on the left side, which is the opposite from other backend
  * "git mergetool" now feeds files to the "p4merge" backend in the
    order that matches the p4 convention, where "theirs" is usually
    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
 track are contained in this release (see release notes to them for
 details).
 
 track are contained in this release (see release notes to them for
 details).
 

+ * "git merge $(git rev-parse v1.8.2)" behaved quite differently from
+   "git merge v1.8.2", as if v1.8.2 were written as v1.8.2^0 and did
+   not pay much attention to the annotated tag payload.  Make the code
+   notice the type of the tag object, in addition to the dwim_ref()
+   based classification the current code uses (i.e. the name appears
+   in refs/tags/) to decide when to special case merging of tags.
+   (merge a38d3d7 jc/merge-tag-object later to maint).
+

  * Fix 1.8.1.x regression that stopped matching "dir" (without
    trailing slash) to a directory "dir".
    (merge efa5f82 jc/directory-attrs-regression-fix later to maint-1.8.1).
  * Fix 1.8.1.x regression that stopped matching "dir" (without
    trailing slash) to a directory "dir".
    (merge efa5f82 jc/directory-attrs-regression-fix later to maint-1.8.1).