Merge branch 'ja/doc-placeholders-fix'

Docfix.

* ja/doc-placeholders-fix:
  doc: enforce placeholders in documentation
  doc: enforce dashes in placeholders

diff --cc Documentation/git.txt
Simple merge

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

diff --cc builtin/commit-graph.c
Simple merge