diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-08-31 16:52:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-31 16:52:53 -0700 |
| commit | 7f314565fe20e324e8db1a7c233e43ca4e3683f0 (patch) | |
| tree | e548496395a012f6ff7072bb4fb8f5d772a9f07d /Documentation | |
| parent | 7df437e56b5a2c5ec7140dd097b517563db4972c (diff) | |
| parent | 14877436871a1e5e38deb64abb884b480ff02567 (diff) | |
| download | git-7f314565fe20e324e8db1a7c233e43ca4e3683f0.tar.gz git-7f314565fe20e324e8db1a7c233e43ca4e3683f0.tar.xz | |
Merge branch 'maint'
* maint:
Document sendemail.envelopesender configuration
Document clarification: gitmodules, gitattributes
config.txt: Add missing colons after option name
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 2 | ||||
| -rw-r--r-- | Documentation/git-send-email.txt | 3 | ||||
| -rw-r--r-- | Documentation/gitattributes.txt | 2 | ||||
| -rw-r--r-- | Documentation/gitmodules.txt | 2 |
4 files changed, 6 insertions, 3 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index af57d9430..ed3285f89 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -697,7 +697,7 @@ gitcvs.logfile:: Path to a log file where the CVS server interface well... logs various stuff. See linkgit:git-cvsserver[1]. -gitcvs.usecrlfattr +gitcvs.usecrlfattr:: If true, the server will look up the `crlf` attribute for files to determine the '-k' modes to use. If `crlf` is set, the '-k' mode will be left blank, so cvs clients will diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt index e2437f30c..3c3e1b0e7 100644 --- a/Documentation/git-send-email.txt +++ b/Documentation/git-send-email.txt @@ -179,6 +179,9 @@ user is prompted for a password while the input is masked for privacy. This is useful if your default address is not the address that is subscribed to a list. If you use the sendmail binary, you must have suitable privileges for the -f parameter. + Default is the value of the 'sendemail.envelopesender' configuration + variable; if that is unspecified, choosing the envelope sender is left + to your MTA. --to:: Specify the primary recipient of the emails generated. diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index 1f23d27a6..5fb500741 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -7,7 +7,7 @@ gitattributes - defining attributes per path SYNOPSIS -------- -$GIT_DIR/info/attributes, gitattributes +$GIT_DIR/info/attributes, .gitattributes DESCRIPTION diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt index f8d122a8b..d1a17e262 100644 --- a/Documentation/gitmodules.txt +++ b/Documentation/gitmodules.txt @@ -7,7 +7,7 @@ gitmodules - defining submodule properties SYNOPSIS -------- -gitmodules +$GIT_WORK_DIR/.gitmodules DESCRIPTION |