X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=Documentation%2Fpretty-options.txt;h=af6d2b995a050007ae088dec8e2c3474e9f06ad5;hb=894a9d333e9e2015cad00d95250b7c5d3acea8b6;hp=aa96caeab26ee6132adbef03d2ca17e91f634208;hpb=6ceeaee7ea5bb754c76ce93c5b289f72d69fdb92;p=thirdparty%2Fgit.git diff --git a/Documentation/pretty-options.txt b/Documentation/pretty-options.txt index aa96caeab2..af6d2b995a 100644 --- a/Documentation/pretty-options.txt +++ b/Documentation/pretty-options.txt @@ -30,9 +30,18 @@ people using 80-column terminals. defaults to UTF-8. --no-notes:: ---show-notes:: +--show-notes[=]:: Show the notes (see linkgit:git-notes[1]) that annotate the commit, when showing the commit log message. This is the default for `git log`, `git show` and `git whatchanged` commands when there is no `--pretty`, `--format` nor `--oneline` option is given on the command line. ++ +With an optional argument, add this ref to the list of notes. The ref +is taken to be in `refs/notes/` if it is not qualified. + +--[no-]standard-notes:: + Enable or disable populating the notes ref list from the + 'core.notesRef' and 'notes.displayRef' variables (or + corresponding environment overrides). Enabled by default. + See linkgit:git-config[1].