summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-06-01 14:11:17 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-06-01 14:11:17 -0700
commita6605d76cdad37ed3c55a7be4d2e0af0f4721bb2 (patch)
tree1c9e3d93f5ecc760669a6908569bf0ac6f5134b3 /Documentation
parentUpdate draft release notes to 1.7.6 (diff)
parentGit 1.7.5.4 (diff)
downloadtgif-a6605d76cdad37ed3c55a7be4d2e0af0f4721bb2.tar.xz
Sync with 1.7.5.4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/RelNotes/1.7.5.4.txt3
-rw-r--r--Documentation/git.txt3
2 files changed, 5 insertions, 1 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 65317cce18..5c45446a4a 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],