Merge branch 'ja/fetch-doc' into maint

* ja/fetch-doc:
Documentation/merge-options.txt: order options in alphabetical groups
Documentation/git-pull.txt: Add subtitles above included option files
Documentation/fetch-options.txt: order options alphabetically

diff --cc Documentation/git-pull.txt
Simple merge