Git 1.7.10.5v1.7.10.5maint-1.7.10

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

4 files changed, 16 insertions, 3 deletions

diff --git a/Documentation/RelNotes/1.7.10.5.txt b/Documentation/RelNotes/1.7.10.5.txt
new file mode 100644
index 0000000000..4db1770e38
--- /dev/null
+++ 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
index 55e405d644..682fec5677 100644
--- 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],
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 86458311a1..2ccbf24f9f 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.7.10.3
+DEF_VER=v1.7.10.5
 
 LF='
 '
diff --git a/RelNotes b/RelNotes
index e6cfd0bd0e..1af36eae21 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/1.7.10.4.txt
\ No newline at end of file
+Documentation/RelNotes/1.7.10.5.txt
\ No newline at end of file