diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-02-05 10:59:05 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-02-05 10:59:05 -0800 |
| commit | b401a12a2c49d3f3e81e356782d9ca49aaa97faa (patch) | |
| tree | 3c08d47265838d7b13ae8e2649835159077a6f0c /Documentation | |
| parent | Merge branch 'maint-1.6.5' into maint (diff) | |
| parent | Fix "log --oneline" not to show notes (diff) | |
| download | tgif-b401a12a2c49d3f3e81e356782d9ca49aaa97faa.tar.xz | |
Merge branch 'jc/maint-limit-note-output' into maint
* 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 bff94991b6..aa96caeab2 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. |