summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-12-13 21:55:31 -0800
committerJunio C Hamano <gitster@pobox.com>2011-12-13 21:55:31 -0800
commit66c11f02b031aca6f1756086fefdf4b8a5575c56 (patch)
treeea54e306871bc6d2dda857a31b93c1bd669c619f
parentc0eb9ccfb97297e25ccbab0481159282147b353f (diff)
downloadgit-66c11f02b031aca6f1756086fefdf4b8a5575c56.tar.gz
Git 1.7.7.5v1.7.7.5
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes/1.7.7.5.txt14
-rw-r--r--Documentation/git.txt6
-rwxr-xr-xGIT-VERSION-GEN2
l---------RelNotes2
4 files changed, 21 insertions, 3 deletions
diff --git a/Documentation/RelNotes/1.7.7.5.txt b/Documentation/RelNotes/1.7.7.5.txt
new file mode 100644
index 0000000000..7b0931987b
--- /dev/null
+++ b/Documentation/RelNotes/1.7.7.5.txt
@@ -0,0 +1,14 @@
+Git v1.7.7.5 Release Notes
+==========================
+
+Fixes since v1.7.7.4
+--------------------
+
+ * After fetching from a remote that has very long refname, the reporting
+ output could have corrupted by overrunning a static buffer.
+
+ * "git checkout" and "git merge" treated in-tree .gitignore and exclude
+ file in $GIT_DIR/info/ directory inconsistently when deciding which
+ untracked files are ignored and expendable.
+
+Also contains minor fixes and documentation updates.
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 4a29f47b41..5c313e5214 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -44,9 +44,13 @@ 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.7.1/git.html[documentation for release 1.7.7.1]
+* link:v1.7.7.5/git.html[documentation for release 1.7.7.5]
* release notes for
+ link:RelNotes/1.7.7.5.txt[1.7.7.5],
+ link:RelNotes/1.7.7.4.txt[1.7.7.4],
+ link:RelNotes/1.7.7.3.txt[1.7.7.3],
+ link:RelNotes/1.7.7.2.txt[1.7.7.2],
link:RelNotes/1.7.7.1.txt[1.7.7.1],
link:RelNotes/1.7.7.txt[1.7.7].
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index d0ec749e9a..7b7ac91f80 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v1.7.7.4
+DEF_VER=v1.7.7.5
LF='
'
diff --git a/RelNotes b/RelNotes
index 907613e8c4..cd6bf00d34 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/1.7.7.4.txt \ No newline at end of file
+Documentation/RelNotes/1.7.7.5.txt \ No newline at end of file