diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-07-30 13:17:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-30 13:18:18 -0700 |
| commit | 9c9b9ede9062ad702a6aa4384a597beb473e0293 (patch) | |
| tree | 21edd4384f05415e33d63541793937e3bc28137b | |
| parent | Merge branch 'rj/maint-grep-remove-redundant-test' (diff) | |
| parent | Git 1.7.11.4 (diff) | |
| download | tgif-9c9b9ede9062ad702a6aa4384a597beb473e0293.tar.xz | |
Sync with 1.7.11.4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/RelNotes/1.7.11.4.txt | 31 | ||||
| -rw-r--r-- | Documentation/git.txt | 3 |
2 files changed, 33 insertions, 1 deletions
diff --git a/Documentation/RelNotes/1.7.11.4.txt b/Documentation/RelNotes/1.7.11.4.txt new file mode 100644 index 0000000000..3a640c2d4d --- /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 <parent> <tree>" 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 bf22ad527c..7af8aaa047 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], |