Sync with maint

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

2 files changed, 20 insertions, 25 deletions

diff --git a/Documentation/RelNotes/1.7.10.txt b/Documentation/RelNotes/1.7.10.txt
index 0be3d3af3..4bafa7c36 100644
--- a/Documentation/RelNotes/1.7.10.txt
+++ b/Documentation/RelNotes/1.7.10.txt
@@ -99,28 +99,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
diff --git a/Documentation/RelNotes/1.7.9.1.txt b/Documentation/RelNotes/1.7.9.1.txt
index a6c15e5d5..a2e5b0dec 100644
--- a/Documentation/RelNotes/1.7.9.1.txt
+++ b/Documentation/RelNotes/1.7.9.1.txt
@@ -4,9 +4,17 @@ Git v1.7.9.1 Release Notes
 Fixes since v1.7.9
 ------------------
 
+ * rpmbuild noticed an unpackaged but installed *.mo file and failed.
+
  * Subprocesses spawned from various git programs were often left running
    to completion even when the top-level process was killed.
 
+ * "git 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.
+
+ * Typo in "git branch --edit-description my-tpoic" was not diagnosed.
+
  * Using "git grep -l/-L" together with options -W or --break may not
    make much sense as the output is to only count the number of hits
    and there is no place for file breaks, but the latter options made
@@ -16,14 +24,22 @@ Fixes since v1.7.9
    chain and veered into side branch from which the whole change to the
    specified paths came.
 
+ * "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 was changed to allow fast-forwarding without recording the mergetag.
+
+ * "git mergetool" now gives an empty file as the common base version
+   to the backend when dealing with the "both sides added, differently"
+   case.
+
  * "git push -q" was not sufficiently quiet.
 
  * When "git push" fails to update any refs, the client side did not
    report an error correctly to the end user.
 
- * "git mergetool" now gives an empty file as the common base version
-   to the backend when dealing with the "both sides added, differently"
-   case.
+ * "rebase" and "commit --amend" failed to work on commits with ancient
+   timestamps near year 1970.
 
  * When asking for a tag to be pulled, "request-pull" did not show the
    name of the tag prefixed with "tags/", which would have helped older