diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-09-13 01:33:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-09-13 01:33:18 -0700 |
| commit | dc1b0c06ee9b3d2fb086a89e5b12da35bf360e4c (patch) | |
| tree | 4097a3e7f1507c66ef4effc9d2da243c6382a3ed /Documentation | |
| parent | 8b54f63dce34c3bbd7ff919fb53c1c253221fe71 (diff) | |
| parent | edf563fbaa2ab50734db4a61e9092f25fbb5a417 (diff) | |
| download | git-dc1b0c06ee9b3d2fb086a89e5b12da35bf360e4c.tar.gz | |
Merge branch 'jk/unwanted-advices'
* jk/unwanted-advices:
status: make "how to stage" messages optional
push: make non-fast-forward help message configurable
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 5256c7fb81..8cbabe8012 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -113,6 +113,21 @@ For command-specific variables, you will find a more detailed description in the appropriate manual page. You will find a description of non-core porcelain configuration variables in the respective porcelain documentation. +advice.*:: + When set to 'true', display the given optional help message. + When set to 'false', do not display. The configuration variables + are: ++ +-- + pushNonFastForward:: + Advice shown when linkgit:git-push[1] refuses + non-fast-forward refs. Default: true. + statusHints:: + Directions on how to stage/unstage/add shown in the + output of linkgit:git-status[1] and the template shown + when writing commit messages. Default: true. +-- + core.fileMode:: If false, the executable bit differences between the index and the working copy are ignored; useful on broken filesystems like FAT. |