path: root/Documentation
diff options
Diffstat (limited to 'Documentation')
3 files changed, 16 insertions, 2 deletions
diff --git a/Documentation/RelNotes/1.8.2.txt b/Documentation/RelNotes/1.8.2.txt
index ff5869d..78820ac 100644
--- a/Documentation/RelNotes/1.8.2.txt
+++ b/Documentation/RelNotes/1.8.2.txt
@@ -213,6 +213,14 @@ details).
to add a newline after such a line.
(merge e0db176 sp/shortlog-missing-lf later to maint).
+ * Command line completion leaked an unnecessary error message while
+ looking for possible matches with paths in <tree-ish>.
+ (merge ca87dd6 ds/completion-silence-in-tree-path-probe later to maint).
+ * Command line completion for "tcsh" emitted an unwanted space
+ after completing a single directory name.
+ (merge 92f1c04 mk/complete-tcsh later to maint).
* Some shells do not behave correctly when IFS is unset; work it
around by explicitly setting it to the default value.
(merge 393050c jc/maint-fbsd-sh-ifs-workaround later to maint).
diff --git a/Documentation/config.txt b/Documentation/config.txt
index d5809e0..ef45c99 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1361,6 +1361,12 @@ help.autocorrect::
value is 0 - the command will be just shown but not executed.
This is the default.
+ Specify the path where the HTML documentation resides. File system paths
+ and URLs are supported. HTML pages will be prefixed with this path when
+ help is displayed in the 'web' format. This defaults to the documentation
+ path of your Git installation.
Override the HTTP proxy, normally configured using the 'http_proxy',
'https_proxy', and 'all_proxy' environment variables (see
diff --git a/Documentation/git-commit-tree.txt b/Documentation/git-commit-tree.txt
index 6d5a04c..a221169 100644
--- a/Documentation/git-commit-tree.txt
+++ b/Documentation/git-commit-tree.txt
@@ -72,13 +72,13 @@ if set:
(nb "<", ">" and "\n"s are stripped)
In case (some of) these environment variables are not set, the information
is taken from the configuration items and, or, if not
-present, system user name and the hostname used for outgoing mail (taken
+present, the environment variable EMAIL, or, if that is not set,
+system user name and the hostname used for outgoing mail (taken
from `/etc/mailname` and falling back to the fully qualified hostname when
that file does not exist).