Documentation / pretty-options.txton commit merge script: improve log message subject (13dd255)
   1--pretty[='<format>']::
   2--format[='<format>']::
   3
   4        Pretty-print the contents of the commit logs in a given format,
   5        where '<format>' can be one of 'oneline', 'short', 'medium',
   6        'full', 'fuller', 'email', 'raw' and 'format:<string>'.  See
   7        the "PRETTY FORMATS" section for some additional details for each
   8        format.  When omitted, the format defaults to 'medium'.
   9+
  10Note: you can specify the default pretty format in the repository
  11configuration (see linkgit:git-config[1]).
  12
  13--abbrev-commit::
  14        Instead of showing the full 40-byte hexadecimal commit object
  15        name, show only a partial prefix.  Non default number of
  16        digits can be specified with "--abbrev=<n>" (which also modifies
  17        diff output, if it is displayed).
  18+
  19This should make "--pretty=oneline" a whole lot more readable for
  20people using 80-column terminals.
  21
  22--oneline::
  23        This is a shorthand for "--pretty=oneline --abbrev-commit"
  24        used together.
  25
  26--encoding[=<encoding>]::
  27        The commit objects record the encoding used for the log message
  28        in their encoding header; this option can be used to tell the
  29        command to re-code the commit log message in the encoding
  30        preferred by the user.  For non plumbing commands this
  31        defaults to UTF-8.
  32
  33--no-notes::
  34--show-notes[=<ref>]::
  35        Show the notes (see linkgit:git-notes[1]) that annotate the
  36        commit, when showing the commit log message.  This is the default
  37        for `git log`, `git show` and `git whatchanged` commands when
  38        there is no `--pretty`, `--format` nor `--oneline` option is
  39        given on the command line.
  40+
  41With an optional argument, add this ref to the list of notes.  The ref
  42is taken to be in `refs/notes/` if it is not qualified.
  43
  44--[no-]standard-notes::
  45        Enable or disable populating the notes ref list from the
  46        'core.notesRef' and 'notes.displayRef' variables (or
  47        corresponding environment overrides).  Enabled by default.
  48        See linkgit:git-config[1].