diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-07-10 01:25:46 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-10 01:25:46 +0300 |
| commit | cde9a64ea35ceeaa5e8dd2da2662445510fe651c (patch) | |
| tree | 9b4d154625ca23d792cda8f8a65419adcfba1fc7 /Documentation/config/advice.txt | |
| 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 'Documentation/config/advice.txt')
| -rw-r--r-- | Documentation/config/advice.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/config/advice.txt b/Documentation/config/advice.txt index 0103faa417..ee85c536ce 100644 --- a/Documentation/config/advice.txt +++ b/Documentation/config/advice.txt @@ -4,6 +4,10 @@ advice.*:: can tell Git that you do not need help by setting these to 'false': + -- + fetchShowForcedUpdates:: + Advice shown when linkgit:git-fetch[1] takes a long time + to calculate forced updates after ref updates, or to warn + that the check is disabled. pushUpdateRejected:: Set this variable to 'false' if you want to disable 'pushNonFFCurrent', |