diff options
| author | Jeff King <peff@peff.net> | 2009-09-09 07:38:58 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-09-11 21:33:20 -0700 |
| commit | 75194438f412714f4e82ca01e9038dc6714498c4 (patch) | |
| tree | fdb94ce1638902652ab77a84d7ffa9271f2fe47a /builtin-push.c | |
| parent | 6ea71fe7d36cf5b81c2100d97a822ecf0bc04746 (diff) | |
| download | git-75194438f412714f4e82ca01e9038dc6714498c4.tar.gz | |
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 'builtin-push.c')
| -rw-r--r-- | builtin-push.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-push.c b/builtin-push.c index 787011f928..6eda372a55 100644 --- a/builtin-push.c +++ b/builtin-push.c @@ -157,7 +157,7 @@ static int do_push(const char *repo, int flags) continue; error("failed to push some refs to '%s'", url[i]); - if (nonfastforward) { + if (nonfastforward && advice_push_nonfastforward) { printf("To prevent you from losing history, non-fast-forward updates were rejected\n" "Merge the remote changes before pushing again. See the 'non-fast forward'\n" "section of 'git push --help' for details.\n"); |