Merge branch 'maint'

* maint: git fetch documentation: describe short '-p' synonym to '--prune' option format-patch: document the format.to configuration setting