Merge branch 'maint'

* maint:
  doc/fast-import: clarify notemodify command
  Documentation: minor grammatical fix in rev-list-options.txt
  Documentation: git-filter-branch honors replacement refs
  remote-curl: Add a format check to parsing of info/refs
  git-config: Remove extra whitespaces

diff --cc Documentation/rev-list-options.txt
Simple merge

diff --cc config.c
Simple merge

diff --cc remote-curl.c
Simple merge