Merge branch 'dj/fetch-tagopt' into maint

* dj/fetch-tagopt:
fetch: allow command line --tags to override config

diff --cc Documentation/config.txt
Simple merge

diff --cc builtin/fetch.c
Simple merge