diff options
| author |  Chris Rorvick <chris@rorvick.com> | 2012-12-02 21:27:50 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2012-12-03 08:04:08 -0800 |
| commit | 1184564eac8ef6c82da068a31f60aee0d6870265 (patch) | |
| tree | 72309ffafe3d453c9ea44cc3d3691338bcbd942a /Documentation | |
| parent | push: cleanup push rules comment (diff) | |
| download | tgif-1184564eac8ef6c82da068a31f60aee0d6870265.tar.xz | |
push: rename config variable for more general use
The 'pushNonFastForward' advice config can be used to squelch several
instances of push-related advice. Rename it to 'pushUpdateRejected' to
cover other reject scenarios that are unrelated to fast-forwarding.
Retain the old name for compatibility.
Signed-off-by: Chris Rorvick <chris@rorvick.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 9a0544cf1f..92903f22d9 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -140,7 +140,7 @@ advice.*:: can tell Git that you do not need help by setting these to 'false': + -- - pushNonFastForward:: + pushUpdateRejected:: Set this variable to 'false' if you want to disable 'pushNonFFCurrent', 'pushNonFFDefault', and 'pushNonFFMatching' simultaneously. |