diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-06-01 14:08:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-06-01 14:08:26 -0700 |
| commit | e5af0de202e885b793482d416b8ce9d50dd2b8bc (patch) | |
| tree | 2d8ec73bb0eb27630e8bbdb4930f35de7394a5f1 | |
| parent | Merge branch 'jk/maint-config-alias-fix' into maint (diff) | |
| download | tgif-e5af0de202e885b793482d416b8ce9d50dd2b8bc.tar.xz | |
Git 1.7.5.4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/RelNotes/1.7.5.4.txt | 3 | ||||
| -rw-r--r-- | Documentation/git.txt | 3 | ||||
| -rwxr-xr-x | GIT-VERSION-GEN | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/Documentation/RelNotes/1.7.5.4.txt b/Documentation/RelNotes/1.7.5.4.txt index f3412ced33..cf3f455ced 100644 --- 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. + * 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 diff --git a/Documentation/git.txt b/Documentation/git.txt index 504e1b1187..8c0bfdf5a0 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.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 + 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], diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 85e25a6dd8..6219441293 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.7.5.3 +DEF_VER=v1.7.5.4 LF=' ' |