Git 1.7.5.4

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

diff --git a/Documentation/RelNotes/1.7.5.4.txt b/Documentation/RelNotes/1.7.5.4.txt
index f3412ced33479f46bf314a9d3d96fb0e6cc3f000..cf3f455ced07b2d84c9acb4e13313aec864a3b67 100644 (file)
--- a/Documentation/RelNotes/1.7.5.4.txt
+++ b/Documentation/RelNotes/1.7.5.4.txt
@@ -8,6 +8,9 @@ Fixes since v1.7.5.3
    that it was told to add everthing ('a') when up-arrow was pressed by
    mistake.
 
    that it was told to add everthing ('a') when up-arrow was pressed by
    mistake.
 

+ * Setting a git command that uses custom configuration via "-c var=val"
+   as an alias caused a crash due to a realloc(3) failure.
+

  * "git diff -C -C" used to disable the rename detection entirely when
    there are too many copy candidate paths in the tree; now it falls
    back to "-C" when doing so would keep the copy candidate paths
  * "git diff -C -C" used to disable the rename detection entirely when
    there are too many copy candidate paths in the tree; now it falls
    back to "-C" when doing so would keep the copy candidate paths

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 504e1b118711c727cd621a98084a17e56e0d874f..8c0bfdf5a08cf80419f35994d66b03a189d7ea2a 100644 (file)
--- 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:
 
 branch of the `git.git` repository.
 Documentation for older releases are available here:
 

-* link:v1.7.5.3/git.html[documentation for release 1.7.5.3]
+* link:v1.7.5.4/git.html[documentation for release 1.7.5.4]

 
 * release notes for
 
 * release notes for

+  link:RelNotes/1.7.5.4.txt[1.7.5.4],

   link:RelNotes/1.7.5.3.txt[1.7.5.3],
   link:RelNotes/1.7.5.2.txt[1.7.5.2],
   link:RelNotes/1.7.5.1.txt[1.7.5.1],
   link:RelNotes/1.7.5.3.txt[1.7.5.3],
   link:RelNotes/1.7.5.2.txt[1.7.5.2],
   link:RelNotes/1.7.5.1.txt[1.7.5.1],

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 85e25a6dd86852126ae864054f9bbf05d01bf7c1..6219441293889c08fb47dea831c3c54f30d5f67e 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE

-DEF_VER=v1.7.5.3
+DEF_VER=v1.7.5.4

 
 LF='
 '
 
 LF='
 '