Sync with 1.7.9.1

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

2 files changed, 11 insertions, 6 deletions

diff --git a/Documentation/RelNotes/1.7.10.txt b/Documentation/RelNotes/1.7.10.txt
index 4bafa7c366..be3001afe2 100644
--- 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
diff --git a/Documentation/RelNotes/1.7.9.1.txt b/Documentation/RelNotes/1.7.9.1.txt
index a2e5b0dece..6957183dbb 100644
--- a/Documentation/RelNotes/1.7.9.1.txt
+++ b/Documentation/RelNotes/1.7.9.1.txt
@@ -4,6 +4,13 @@ Git v1.7.9.1 Release Notes
 Fixes since v1.7.9
 ------------------
 
+ * The makefile allowed environment variable X seep into it result in
+   command names suffixed with unnecessary strings.
+
+ * The set of included header files in compat/inet-{ntop,pton}
+   wrappers was updated for Windows some time ago, but in a way that
+   broke Solaris build.
+
  * rpmbuild noticed an unpackaged but installed *.mo file and failed.
 
  * Subprocesses spawned from various git programs were often left running
@@ -24,6 +31,8 @@ Fixes since v1.7.9
    chain and veered into side branch from which the whole change to the
    specified paths came.
 
+ * "git merge --no-edit $tag" failed to honor the --no-edit option.
+
  * "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
@@ -49,4 +58,6 @@ Fixes since v1.7.9
    in .gitmodules when the submodule at $path was once added to the
    superproject and already initialized.
 
+ * Many small corner case bugs on "git tag -n" was corrected.
+
 Also contains minor fixes and documentation updates.