diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-07-09 15:25:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-09 15:25:46 -0700 |
| commit | cde9a64ea35ceeaa5e8dd2da2662445510fe651c (patch) | |
| tree | 9b4d154625ca23d792cda8f8a65419adcfba1fc7 /advice.h | |
| parent | 34186225b3ca3109586fd63ee83aeea342dc668e (diff) | |
| parent | 3883c55138dcfbe2d9a24e3f93a2a4b1d376dde6 (diff) | |
Merge branch 'ds/fetch-disable-force-notice'
"git fetch" and "git pull" reports when a fetch results in non-fast-forward updates to let the user notice unusual situation. The commands learned "--no-shown-forced-updates" option to disable this safety feature. * ds/fetch-disable-force-notice: pull: add --[no-]show-forced-updates passthrough fetch: warn about forced updates in branch listing fetch: add --[no-]show-forced-updates argument
Diffstat (limited to 'advice.h')
| -rw-r--r-- | advice.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/advice.h b/advice.h index c86de9b9b8..940c4c253e 100644 --- a/advice.h +++ b/advice.h @@ -3,6 +3,7 @@ #include "git-compat-util.h" +extern int advice_fetch_show_forced_updates; extern int advice_push_update_rejected; extern int advice_push_non_ff_current; extern int advice_push_non_ff_matching; |