Merge branch 'maint'

* maint:
  builtin-fmt-merge-msg: fix bugs in --file option
  index-pack: Loop over pread until data loading is complete.
  blameview: Fix the browse behavior in blameview
  Fix minor typos/grammar in user-manual.txt
  Correct ordering in git-cvsimport's option documentation
  git-show: Reject native ref
  Fix git-show man page formatting in the EXAMPLES section

diff --cc Documentation/user-manual.txt
Simple merge

diff --cc builtin-fmt-merge-msg.c
Simple merge

diff --cc index-pack.c
Simple merge

diff --cc revision.c
Simple merge