From: Junio C Hamano Date: Mon, 30 Jul 2012 20:09:25 +0000 (-0700) Subject: Git 1.7.11.4 X-Git-Tag: v1.7.11.4 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fc98289584956de9ab1402a4cd607415926f5e68;p=git.git Git 1.7.11.4 Signed-off-by: Junio C Hamano --- diff --git a/Documentation/RelNotes/1.7.11.4.txt b/Documentation/RelNotes/1.7.11.4.txt new file mode 100644 index 000000000..3a640c2d4 --- /dev/null +++ b/Documentation/RelNotes/1.7.11.4.txt @@ -0,0 +1,31 @@ +Git v1.7.11.4 Release Notes +=========================== + +Fixes since v1.7.11.3 +--------------------- + + * "$GIT_DIR/COMMIT_EDITMSG" file that is used to hold the commit log + message user edits was not documented. + + * The advise() function did not use varargs correctly to format + its message. + + * When "git am" failed, old timers knew to check .git/rebase-apply/patch + to see what went wrong, but we never told the users about it. + + * "git commit-tree" learned a more natural "-p " order + of arguments long time ago, but recently forgot it by mistake. + + * "git diff --no-ext-diff" did not output anything for a typechange + filepair when GIT_EXTERNAL_DIFF is in effect. + + * In 1.7.9 era, we taught "git rebase" about the raw timestamp format + but we did not teach the same trick to "filter-branch", which rolled + a similar logic on its own. + + * When "git submodule add" clones a submodule repository, it can get + confused where to store the resulting submodule repository in the + superproject's .git/ directory when there is a symbolic link in the + path to the current directory. + +Also contains minor typofixes and documentation updates. diff --git a/Documentation/git.txt b/Documentation/git.txt index bf22ad527..7af8aaa04 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.11.3/git.html[documentation for release 1.7.11.3] +* link:v1.7.11.4/git.html[documentation for release 1.7.11.4] * release notes for + link:RelNotes/1.7.11.4.txt[1.7.11.4], link:RelNotes/1.7.11.3.txt[1.7.11.3], link:RelNotes/1.7.11.2.txt[1.7.11.2], link:RelNotes/1.7.11.1.txt[1.7.11.1], diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 9f0d5507f..a9dea5c02 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.7.11.3 +DEF_VER=v1.7.11.4 LF=' ' diff --git a/RelNotes b/RelNotes index 8f994bcfa..9f0b313a1 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes/1.7.11.3.txt \ No newline at end of file +Documentation/RelNotes/1.7.11.4.txt \ No newline at end of file