From 75194438f412714f4e82ca01e9038dc6714498c4 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Wed, 9 Sep 2009 07:38:58 -0400 Subject: 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 Signed-off-by: Junio C Hamano --- Documentation/config.txt | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'Documentation') diff --git a/Documentation/config.txt b/Documentation/config.txt index 5256c7fb81..a35b9181bc 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. -- cgit v1.2.3 From edf563fbaa2ab50734db4a61e9092f25fbb5a417 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Wed, 9 Sep 2009 07:43:03 -0400 Subject: status: make "how to stage" messages optional These messages are nice for new users, but experienced git users know how to manipulate the index, and these messages waste a lot of screen real estate. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- Documentation/config.txt | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Documentation') diff --git a/Documentation/config.txt b/Documentation/config.txt index a35b9181bc..8cbabe8012 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -122,6 +122,10 @@ advice.*:: 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:: -- cgit v1.2.3