reset: make tree counting less confusing

diff --git a/Documentation/RelNotes/2.15.0.txt b/Documentation/RelNotes/2.15.0.txt
index cb630724c7c9172c56630d1cc27525e187d9da39..4b3fd229e927aa57c166855df43863d1aef13517 100644 (file)
--- a/Documentation/RelNotes/2.15.0.txt
+++ b/Documentation/RelNotes/2.15.0.txt
@@ -18,6 +18,9 @@ Backward compatibility notes and other notable changes.
    might still be cases that need to be addressed--bug reports are
    greatly appreciated.
 
+ * "branch --set-upstream" that has been deprecated in Git 1.8 has
+   finally been retired.
+
 
 Updates since v2.14
 -------------------
@@ -71,6 +74,9 @@ UI, Workflows & Features
    which can make it succeed if the lock holder was holding it during
    a read-only operation.
 
+ * "branch --set-upstream" that has been deprecated in Git 1.8 has
+   finally been retired.
+
 
 Performance, Internal Implementation, Development Support etc.
 
@@ -241,6 +247,10 @@ Fixes since v2.14
    a squash merge in progress.  This has been fixed.
    (merge 9d89b35526 mg/killed-merge later to maint).
 
+ * "git archive" did not work well with pathspecs and the
+   export-ignore attribute.
+   (merge 5ff247ac0c rs/archive-excluded-directory later to maint).
+
  * Other minor doc, test and build updates and code cleanups.
    (merge dff2813391 ab/ref-filter-no-contains later to maint).
    (merge f094b89a4d ma/parse-maybe-bool later to maint).