]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'ds/fetch-disable-force-notice'
authorJunio C Hamano <gitster@pobox.com>
Tue, 9 Jul 2019 22:25:46 +0000 (15:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 9 Jul 2019 22:25:46 +0000 (15:25 -0700)
commitcde9a64ea35ceeaa5e8dd2da2662445510fe651c
tree9b4d154625ca23d792cda8f8a65419adcfba1fc7
parent34186225b3ca3109586fd63ee83aeea342dc668e
parent3883c55138dcfbe2d9a24e3f93a2a4b1d376dde6
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
Documentation/config/advice.txt
Documentation/fetch-options.txt
advice.c
advice.h
builtin/fetch.c