Sync with 1.7.9.1

[~andy/git] / Documentation / RelNotes / 1.7.10.txt

diff --git a/Documentation/RelNotes/1.7.10.txt b/Documentation/RelNotes/1.7.10.txt
index 0be3d3af310470304952604a3e097d1e023ad308..be3001afe239121328b9d949332e4bf96698ec67 100644 (file)
--- a/Documentation/RelNotes/1.7.10.txt
+++ b/Documentation/RelNotes/1.7.10.txt
@@ -69,16 +69,10 @@ Unless otherwise noted, all the fixes since v1.7.9 in the maintenance
 releases are contained in this release (see release notes to them for
 details).
 
- * "git merge --no-edit $tag" failed to honor the --no-edit option.
-   (merge 3adab6f jn/merge-no-edit-fix later to maint).
-
  * The error message emitted when we see an empty loose object was
    not phrased correctly.
    (merge 33e42de mm/empty-loose-error-message later to maint).
 
- * Many small corner case bugs on "git tag -n" was corrected.
-   (merge 31fd8d7 jk/maint-tag-show-fixes later to maint).
-
  * "git commit" refused to create a commit when entries added with
    "add -N" remained in the index, without telling Git what their content
    in the next commit should be. We should have created the commit without
@@ -99,28 +93,7 @@ details).
    (merge f026358 jc/maint-mailmap-output later to maint).
 
  * "checkout -b" did not allow switching out of an unborn branch.
-    (merge abe1998 jc/checkout-out-of-unborn later to maint).
-
- * "add -e" learned not to show a diff for an otherwise unmodified
-   submodule that only has uncommitted local changes in the patch
-   prepared by for the user to edit.
-   (merge 701825d js/add-e-submodule-fix later to maint).
-
- * "rebase" and "commit --amend" failed to work on commits with ancient
-   timestamps near year 1970.
-   (merge 2c733fb jc/parse-date-raw later to maint).
-
- * "git merge --ff-only $tag" failed because it cannot record the
-   required mergetag without creating a merge, but this is so common
-   operation for branch that is used _only_ to follow the upstream, so
-   it is allowed to fast-forward without recording the mergetag.
-   (merge b5c9f1c jc/merge-ff-only-stronger-than-signed-merge later to maint).
-
- * Typo in "git branch --edit-description my-tpoic" was not diagnosed.
-   (merge c2d17ba jc/branch-desc-typoavoidance later to maint).
-
- * rpmbuild noticed an unpackaged but installed *.mo file and failed.
-   (merge 3a9f58c jn/rpm-spec later to maint).
+   (merge abe1998 jc/checkout-out-of-unborn later to maint).
 
 ---
 exec >/var/tmp/1