Merge branch 'ja/doc-git-log-markup'

Doc mark-up updates.

* ja/doc-git-log-markup:
  doc: git-log: convert log config to new doc format
  doc: git-log: convert diff options to new doc format
  doc: git-log: convert pretty formats to new doc format
  doc: git-log: convert pretty options to new doc format
  doc: git-log: convert rev list options to new doc format
  doc: git-log: convert line range format to new doc format
  doc: git-log: convert line range options to new doc format
  doc: git-log convert rev-list-description to new doc format
  doc: convert git-log to new documentation format

diff --cc Documentation/pretty-options.adoc
index b36e96abe28abfae010689fe1bab8366f586cd54,388b245a8a68d48a1ab1ffaf2c70492bfeca544a..8aac51dbe7e938e7eb50d690aa524f617ad425fc
--- 1/Documentation/pretty-options.adoc
--- 2/Documentation/pretty-options.adoc
+++ b/Documentation/pretty-options.adoc
@@@ -55,19 -55,14 +55,19 @@@ people using 80-column terminals
        which disables tab expansion.
  +
  By default, tabs are expanded in pretty formats that indent the log
- message by 4 spaces (i.e.  'medium', which is the default, 'full',
- and 'fuller').
+ message by 4 spaces (i.e.  `medium`, which is the default, `full`,
+ and `fuller`).
  
  ifndef::git-rev-list[]
- --notes[=<ref>]::
+ `--notes[=<ref>]`::
        Show the notes (see linkgit:git-notes[1]) that annotate the
        commit, when showing the commit log message.  This is the default
 +ifndef::with-breaking-changes[]
        for `git log`, `git show` and `git whatchanged` commands when
 +endif::with-breaking-changes[]
 +ifdef::with-breaking-changes[]
 +      for `git log` and `git show` commands when
 +endif::with-breaking-changes[]
        there is no `--pretty`, `--format`, or `--oneline` option given
        on the command line.
  +

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