Merge branch 'ja/doc-formatting-fix'

Documentation mark-up fix.

* ja/doc-formatting-fix:
  doc: fix some placeholders formating
  doc: format alternatives in synopsis

diff --cc Documentation/git-rebase.txt
Simple merge

diff --cc Documentation/git-send-email.txt
Simple merge

diff --cc Documentation/git.txt
Simple merge

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

diff --cc builtin/interpret-trailers.c
Simple merge