Sync with 1.7.10.5

git · Jun 17, 2012 · a890c99 · a890c99
2 parents 7dba3f7 + 785ee49
commit a890c99
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/Documentation/RelNotes/1.7.10.5.txt b/Documentation/RelNotes/1.7.10.5.txt
@@ -0,0 +1,12 @@
+Git v1.7.10.5 Release Notes
+===========================
+
+Fixes since v1.7.10.4
+---------------------
+
+ * "git fast-export" did not give a readable error message when the
+   same mark erroneously appeared twice in the --import-marks input.
+
+ * "git rebase -p" used to pay attention to rebase.autosquash which
+    was wrong.  "git rebase -p -i" should, but "git rebase -p" by
+    itself should not.
diff --git a/Documentation/git.txt b/Documentation/git.txt
@@ -44,9 +44,10 @@ unreleased) version of git, that is available from 'master'
 branch of the `git.git` repository.
 Documentation for older releases are available here:
 
-* link:v1.7.10.4/git.html[documentation for release 1.7.10.4]
+* link:v1.7.10.5/git.html[documentation for release 1.7.10.5]
 
 * release notes for
+  link:RelNotes/1.7.10.5.txt[1.7.10.5],
   link:RelNotes/1.7.10.4.txt[1.7.10.4],
   link:RelNotes/1.7.10.3.txt[1.7.10.3],
   link:RelNotes/1.7.10.2.txt[1.7.10.2],