aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2009-09-09 07:38:58 -0400
committerJunio C Hamano <gitster@pobox.com>2009-09-11 21:33:20 -0700
commit75194438f412714f4e82ca01e9038dc6714498c4 (patch)
treefdb94ce1638902652ab77a84d7ffa9271f2fe47a /Documentation
parent6ea71fe7d36cf5b81c2100d97a822ecf0bc04746 (diff)
downloadgit-75194438f412714f4e82ca01e9038dc6714498c4.tar.gz
git-75194438f412714f4e82ca01e9038dc6714498c4.tar.xz
push: make non-fast-forward help message configurable
This message is designed to help new users understand what has happened when refs fail to push. However, it does not help experienced users at all, and significantly clutters the output, frequently dwarfing the regular status table and making it harder to see. This patch introduces a general configuration mechanism for optional messages, with this push message as the first example. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt11
1 files changed, 11 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 5256c7fb8..a35b9181b 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -113,6 +113,17 @@ 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.
+--
+
core.fileMode::
If false, the executable bit differences between the index and
the working copy are ignored; useful on broken filesystems like FAT.