Merge branch 'dl/format-patch-notes-config'

"git format-patch" learns a configuration to set the default for
its --notes=<ref> option.

* dl/format-patch-notes-config:
format-patch: teach format.notes config option
git-format-patch.txt: document --no-notes option

diff --cc builtin/log.c
Simple merge

diff --cc t/t4014-format-patch.sh
Simple merge