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 /builtin-push.c | |
| 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 '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"); |