diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-22 16:08:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-22 16:08:01 -0800 |
| commit | 67bc7407211d26de518811dafc2c1cf2e6124709 (patch) | |
| tree | 6fffca8665145d1f3164abce6d980f8c537e1343 /Documentation | |
| parent | f986eecde1e59fc4cc2b0b761ffc0fe563dad267 (diff) | |
| parent | 7dccadf363f9d9ff564ad34117266b2d557a2bc8 (diff) | |
| download | git-67bc7407211d26de518811dafc2c1cf2e6124709.tar.gz git-67bc7407211d26de518811dafc2c1cf2e6124709.tar.xz | |
Merge branch 'jc/maint-limit-note-output'
* jc/maint-limit-note-output:
Fix "log --oneline" not to show notes
Fix "log" family not to be too agressive about showing notes
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/pretty-options.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/pretty-options.txt b/Documentation/pretty-options.txt index bff94991b..aa96caeab 100644 --- a/Documentation/pretty-options.txt +++ b/Documentation/pretty-options.txt @@ -28,3 +28,11 @@ people using 80-column terminals. command to re-code the commit log message in the encoding preferred by the user. For non plumbing commands this defaults to UTF-8. + +--no-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. |