diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-19 01:34:31 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-19 01:34:31 +0400 |
| commit | 304b7d99a705e8c125650dda347a571402222a3e (patch) | |
| tree | 2253732fe52e0394dc19b40e978e7b3946c9a2fb | |
| parent | 39e2e020608716e8710ff391e0d2b6d035cb3dd6 (diff) | |
Git 1.7.12.1v1.7.12.1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/RelNotes/1.7.12.1.txt | 11 | ||||
| -rw-r--r-- | Documentation/git.txt | 3 | ||||
| -rwxr-xr-x | GIT-VERSION-GEN | 2 |
3 files changed, 14 insertions, 2 deletions
diff --git a/Documentation/RelNotes/1.7.12.1.txt b/Documentation/RelNotes/1.7.12.1.txt index 671e3d2eb5..b8f04af19f 100644 --- a/Documentation/RelNotes/1.7.12.1.txt +++ b/Documentation/RelNotes/1.7.12.1.txt @@ -85,6 +85,12 @@ Fixes since v1.7.12 rely on being able to parse "ls-files -s | while read a b c..." started to fail. Protect them from such a misconfiguration. + * The attribute system may be asked for a path that itself or its + leading directories no longer exists in the working tree, and it is + fine if we cannot open .gitattribute file in such a case. Failure + to open per-directory .gitattributes with error status other than + ENOENT and ENOTDIR should be diagnosed, but it wasn't. + * After "gitk" showed the contents of a tag, neither "Reread references" nor "Reload" did not update what is shown as the contents of it, when the user overwrote the tag with "git tag -f". @@ -92,6 +98,9 @@ Fixes since v1.7.12 * "ciabot" script (in contrib/) has been updated with extensive documentation. + * "git-jump" script (in contrib/) did not work well when + diff.noprefix or diff.mnemonicprefix is in effect. + * Older parts of the documentation described as if having a regular file in .git/refs/ hierarchy were the only way to have branches and tags, which is not true for quite some time. @@ -121,3 +130,5 @@ Fixes since v1.7.12 branch name is a parameter to the option, but the heading for the option description was "-B::", not "-B branch::", making the documentation misleading. + +Also contains numerous documentation updates. diff --git a/Documentation/git.txt b/Documentation/git.txt index 34d8a1bbdf..6710cb0a41 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -43,9 +43,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.12/git.html[documentation for release 1.7.12] +* link:v1.7.12.1/git.html[documentation for release 1.7.12.1] * release notes for + link:RelNotes/1.7.12.1.txt[1.7.12.1], link:RelNotes/1.7.12.txt[1.7.12]. * link:v1.7.11.7/git.html[documentation for release 1.7.11.7] diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index b27a2ff687..c4220a09de 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.7.12 +DEF_VER=v1.7.12.1 LF=' ' |