diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-04-09 12:04:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-09 12:04:34 -0700 |
| commit | 0bc85abb7aa9b24b093253018801a0fb43d01122 (patch) | |
| tree | 33cd122d8f79160cf99db6467b17d704baeec24f | |
| parent | Merge branch 'jl/nor-or-nand-and' into maint (diff) | |
| download | tgif-0bc85abb7aa9b24b093253018801a0fb43d01122.tar.xz | |
Git 1.9.2
The second maintenance release for Git 1.9; contains all the fixes
that are scheduled to appear in Git 2.0.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/RelNotes/1.9.2.txt | 20 | ||||
| -rw-r--r-- | Documentation/git.txt | 3 | ||||
| -rwxr-xr-x | GIT-VERSION-GEN | 2 |
3 files changed, 23 insertions, 2 deletions
diff --git a/Documentation/RelNotes/1.9.2.txt b/Documentation/RelNotes/1.9.2.txt index 35904d0458..47a34ca964 100644 --- a/Documentation/RelNotes/1.9.2.txt +++ b/Documentation/RelNotes/1.9.2.txt @@ -4,6 +4,26 @@ Git v1.9.2 Release Notes Fixes since v1.9.1 ------------------ + * Documentation and in-code comments had many instances of mistaken + use of "nor", which have been corrected. + + * "git fetch --prune", when the right-hand-side of multiple fetch + refspecs overlap (e.g. storing "refs/heads/*" to + "refs/remotes/origin/*", while storing "refs/frotz/*" to + "refs/remotes/origin/fr/*"), aggressively thought that lack of + "refs/heads/fr/otz" on the origin site meant we should remove + "refs/remotes/origin/fr/otz" from us, without checking their + "refs/frotz/otz" first. + + Note that such a configuration is inherently unsafe (think what + should happen when "refs/heads/fr/otz" does appear on the origin + site), but that is not a reason not to be extra careful. + + * "git update-ref --stdin" did not fail a request to create a ref + when the ref already existed. + + * "git diff --no-index -Mq a b" fell into an infinite loop. + * When it is not necessary to edit a commit log message (e.g. "git commit -m" is given a message without specifying "-e"), we used to disable the spawning of the editor by overriding GIT_EDITOR, but diff --git a/Documentation/git.txt b/Documentation/git.txt index c7b135dbe5..f5b511ddbb 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.9.1/git.html[documentation for release 1.9.1] +* link:v1.9.2/git.html[documentation for release 1.9.2] * release notes for + link:RelNotes/1.9.2.txt[1.9.2], link:RelNotes/1.9.1.txt[1.9.1], link:RelNotes/1.9.0.txt[1.9.0]. diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 220afbd971..5d2bf82085 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.9.1 +DEF_VER=v1.9.2 LF=' ' |