From 6231f82c7fa61a032fa97c200d8ca36ab4764c2e Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 23 Oct 2011 22:18:52 -0700 Subject: [PATCH] Autogenerated HTML docs for v1.7.7.1-431-g10b2a --- RelNotes/1.7.7.1.txt | 5 +++-- RelNotes/1.7.8.txt | 23 +++++++++++++++++++++-- config.txt | 13 ++++++++++--- git-config.html | 18 +++++++++++++++--- git-daemon.html | 19 ++++++++++++++++++- git-daemon.txt | 10 ++++++++++ git.html | 2 +- git.txt | 3 ++- 8 files changed, 80 insertions(+), 13 deletions(-) diff --git a/RelNotes/1.7.7.1.txt b/RelNotes/1.7.7.1.txt index fecfac8a16..ac9b838e25 100644 --- a/RelNotes/1.7.7.1.txt +++ b/RelNotes/1.7.7.1.txt @@ -5,8 +5,9 @@ Fixes since v1.7.7 ------------------ * On some BSD systems, adding +s bit on directories is detrimental - (it is not necessary on BSD to begin with). The installation - procedure has been updated to take this into account. + (it is not necessary on BSD to begin with). "git init --shared" + has been updated to take this into account without extra makefile + settings on platforms the Makefile knows about. * After incorrectly written third-party tools store a tag object in HEAD, git diagnosed it as a repository corruption and refused to diff --git a/RelNotes/1.7.8.txt b/RelNotes/1.7.8.txt index 886dfbfaa5..d7b2c76c03 100644 --- a/RelNotes/1.7.8.txt +++ b/RelNotes/1.7.8.txt @@ -4,7 +4,7 @@ Git v1.7.8 Release Notes (draft) Updates since v1.7.7 -------------------- - * Some git-svn, git-gui and msysgit updates. + * Some git-svn, git-gui, git-p4 (in contrib) and msysgit updates. * Updates to bash completion scripts. @@ -31,6 +31,9 @@ Updates since v1.7.7 * Variants of "git cherry-pick" and "git revert" that take multiple commits learned to "--continue". + * "git daemon" gives more human readble error messages to clients + using ERR packets when appropriate. + * Errors at the network layer is logged by "git daemon". * "git diff" learned "--minimal" option to spend extra cycles to come @@ -39,6 +42,9 @@ Updates since v1.7.7 * "git diff" learned "--function-context" option to show the whole function as context that was affected by a change. + * "git difftool" can be told to skip launching the tool for a path by + answering 'n' to its prompt. + * "git fetch" learned to honor transfer.fsckobjects configuration to validate the objects that were received from the other end, just like "git receive-pack" (the receiving end of "git push") does. @@ -48,6 +54,10 @@ Updates since v1.7.7 "git receive-pack" (the receiving end of "git push") learned to do the same. + * "git fetch" learned that fetching/cloning from a regular file on the + filesystem is not necessarily a request to unpack a bundle file; the + file could be ".git" with "gitdir: " in it. + * "git for-each-ref" learned "%(contents:subject)", "%(contents:body)" and "%(contents:signature)". The last one is useful for signed tags. @@ -72,6 +82,9 @@ Updates since v1.7.7 * "git merge" learned the "--edit" option to allow users to edit the merge commit log message. + * "git rebase -i" can be told to use special purpose editor suitable + only for its insn sheet via sequence.editor configuration variable. + * "git send-email" learned to respond to "-h"(elp) requests. * "git send-email" allows the value given to sendemail.aliasfile to begin @@ -126,6 +139,12 @@ included in this release. credentials. (merge deba493 jk/http-auth later to maint). + * "git branch -m/-M" advertised to update RENAME_REF ref in the + commit log message that introduced the feature but not anywhere in + the documentation, and never did update such a ref anyway. This + undocumented misfeature that did not exist has been excised. + (merge b0eab01 jc/maint-remove-renamed-ref later to maint). + * Adding many refs to the local repository in one go (e.g. "git fetch" that fetches many tags) and looking up a ref by name in a repository with too many refs were unnecessarily slow. @@ -181,7 +200,7 @@ included in this release. --- exec >/var/tmp/1 -O=v1.7.7-418-g40d6987 +O=v1.7.7-485-g9ee3d37 echo O=$(git describe --always master) git log --first-parent --oneline --reverse ^$O master echo diff --git a/config.txt b/config.txt index b30c7e6278..5a841da6d4 100644 --- a/config.txt +++ b/config.txt @@ -45,9 +45,10 @@ lines. Variables may belong directly to a section or to a given subsection. You can have `[section]` if you have `[section "subsection"]`, but you don't need to. -There is also a case insensitive alternative `[section.subsection]` syntax. -In this syntax, subsection names follow the same restrictions as for section -names. +There is also a deprecated `[section.subsection]` syntax. With this +syntax, the subsection name is converted to lower-case and is also +compared case sensitively. These subsection names follow the same +restrictions as section names. All the other lines (and the remainder of the line after the section header) are recognized as setting variables, in the form @@ -473,6 +474,12 @@ core.editor:: variable when it is set, and the environment variable `GIT_EDITOR` is not set. See linkgit:git-var[1]. +sequence.editor:: + Text editor used by `git rebase -i` for editing the rebase insn file. + The value is meant to be interpreted by the shell when it is used. + It can be overridden by the `GIT_SEQUENCE_EDITOR` environment variable. + When not configured the default commit message editor is used instead. + core.pager:: The command that git will use to paginate output. Can be overridden with the `GIT_PAGER` environment diff --git a/git-config.html b/git-config.html index ae69fbcd56..984354bfdb 100644 --- a/git-config.html +++ b/git-config.html @@ -1094,9 +1094,10 @@ respectively). Section headers cannot span multiple lines. Variables may belong directly to a section or to a given subsection. You can have [section] if you have [section "subsection"], but you don’t need to.

-

There is also a case insensitive alternative [section.subsection] syntax. -In this syntax, subsection names follow the same restrictions as for section -names.

+

There is also a deprecated [section.subsection] syntax. With this +syntax, the subsection name is converted to lower-case and is also +compared case sensitively. These subsection names follow the same +restrictions as section names.

All the other lines (and the remainder of the line after the section header) are recognized as setting variables, in the form name = value. If there is no equal sign on the line, the entire line @@ -1677,6 +1678,17 @@ core.editor

+sequence.editor +
+
+

+ Text editor used by git rebase -i for editing the rebase insn file. + The value is meant to be interpreted by the shell when it is used. + It can be overridden by the GIT_SEQUENCE_EDITOR environment variable. + When not configured the default commit message editor is used instead. +

+
+
core.pager
diff --git a/git-daemon.html b/git-daemon.html index 2ae67b9c69..32a81b3448 100644 --- a/git-daemon.html +++ b/git-daemon.html @@ -843,6 +843,23 @@ the facility of inet daemon to achieve the same before spawning

+--informative-errors +
+
+--no-informative-errors +
+
+

+ When informative errors are turned on, git-daemon will report + more verbose errors to the client, differentiating conditions + like "no such repository" from "repository not exported". This + is more convenient for clients, but may leak information about + the existence of unexported repositories. When informative + errors are not enabled, all errors report "access denied" to the + client. The default is --no-informative-errors. +

+
+
<directory>
@@ -1012,7 +1029,7 @@ services are performed.

diff --git a/git-daemon.txt b/git-daemon.txt index 69a1e4af9e..31b28fc29f 100644 --- a/git-daemon.txt +++ b/git-daemon.txt @@ -161,6 +161,16 @@ the facility of inet daemon to achieve the same before spawning repository configuration. By default, all the services are overridable. +--informative-errors:: +--no-informative-errors:: + When informative errors are turned on, git-daemon will report + more verbose errors to the client, differentiating conditions + like "no such repository" from "repository not exported". This + is more convenient for clients, but may leak information about + the existence of unexported repositories. When informative + errors are not enabled, all errors report "access denied" to the + client. The default is --no-informative-errors. + :: A directory to add to the whitelist of allowed directories. Unless --strict-paths is specified this will also include subdirectories diff --git a/git.html b/git.html index 708728ce36..56dd80e5be 100644 --- a/git.html +++ b/git.html @@ -2406,7 +2406,7 @@ subscribed to the list to send a message there.

diff --git a/git.txt b/git.txt index cbc51d5a94..5e80cfd71a 100644 --- a/git.txt +++ b/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.7/git.html[documentation for release 1.7.7] +* link:v1.7.7.1/git.html[documentation for release 1.7.7.1] * release notes for + link:RelNotes/1.7.7.1.txt[1.7.7.1], link:RelNotes/1.7.7.txt[1.7.7]. * link:v1.7.6.4/git.html[documentation for release 1.7.6.4] -- 2.11.4.GIT