diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-04-09 12:06:14 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-04-09 12:06:14 -0700 |
commit | 68773ac915580e88016c34ce1269730382b501d4 (patch) | |
tree | 35d1fe437e7cf562c1c846ec6644ee70cd361a7e /Documentation | |
parent | 7bf272cc042f41d1c16dfdd0d4893e61622e6dde (diff) | |
parent | 0bc85abb7aa9b24b093253018801a0fb43d01122 (diff) | |
download | git-68773ac915580e88016c34ce1269730382b501d4.tar.gz git-68773ac915580e88016c34ce1269730382b501d4.tar.xz |
Sync with 1.9.2
* maint:
Git 1.9.2
doc/http-backend: missing accent grave in literal mark-up
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/RelNotes/1.9.2.txt | 20 | ||||
-rw-r--r-- | Documentation/git-http-backend.txt | 2 | ||||
-rw-r--r-- | Documentation/git.txt | 3 |
3 files changed, 23 insertions, 2 deletions
diff --git a/Documentation/RelNotes/1.9.2.txt b/Documentation/RelNotes/1.9.2.txt index 35904d045..47a34ca96 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-http-backend.txt b/Documentation/git-http-backend.txt index e8c13f60a..d422ba4b5 100644 --- a/Documentation/git-http-backend.txt +++ b/Documentation/git-http-backend.txt @@ -191,7 +191,7 @@ ScriptAlias /git/ /var/www/cgi-bin/gitweb.cgi/ ---------------------------------------------------------------- Lighttpd:: - Ensure that `mod_cgi`, `mod_alias, `mod_auth`, `mod_setenv` are + Ensure that `mod_cgi`, `mod_alias`, `mod_auth`, `mod_setenv` are loaded, then set `GIT_PROJECT_ROOT` appropriately and redirect all requests to the CGI: + diff --git a/Documentation/git.txt b/Documentation/git.txt index e5f8ed094..35eb677ce 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]. |