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

diff --cc Documentation/config/advice.txt
Simple merge

diff --cc Documentation/fetch-options.txt
Simple merge

diff --cc advice.c
Simple merge

diff --cc advice.h
Simple merge

diff --cc builtin/fetch.c
index 667f2cec7bdcc1bd5bf6f0f99d0dc39ff4071b98,cf7eb0dd8d48456e5ebfb61b9ebe7c5ff43fd470..53ce99d2bbc4efd0a37ad45feaad546ae2db7e13
--- 1/builtin/fetch.c
--- 2/builtin/fetch.c
+++ b/builtin/fetch.c
@@@ -170,8 -178,8 +179,10 @@@ static struct option builtin_fetch_opti
        OPT_STRING_LIST(0, "negotiation-tip", &negotiation_tip, N_("revision"),
                        N_("report that we have only objects reachable from this object")),
        OPT_PARSE_LIST_OBJECTS_FILTER(&filter_options),
 +      OPT_BOOL(0, "auto-gc", &enable_auto_gc,
 +               N_("run 'gc --auto' after fetching")),
+       OPT_BOOL(0, "show-forced-updates", &fetch_show_forced_updates,
+                N_("check for forced-updates on all updated branches")),
        OPT_END()
  };