summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-21 22:57:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-01-21 22:57:41 (GMT)
commit7dccadf363f9d9ff564ad34117266b2d557a2bc8 (patch)
tree8c2eede9c5628b6c8f0fdcb3e756e204c49dea9e /Documentation
parent66b2ed09c2f0f212c5cd5c095c1f1052ecbb9491 (diff)
downloadgit-7dccadf363f9d9ff564ad34117266b2d557a2bc8.zip
git-7dccadf363f9d9ff564ad34117266b2d557a2bc8.tar.gz
git-7dccadf363f9d9ff564ad34117266b2d557a2bc8.tar.bz2
Fix "log --oneline" not to show notes
This option should be treated pretty much the same as --format="%h %s". Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/pretty-options.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/pretty-options.txt b/Documentation/pretty-options.txt
index 1401200..aa96cae 100644
--- a/Documentation/pretty-options.txt
+++ b/Documentation/pretty-options.txt
@@ -34,5 +34,5 @@ people using 80-column terminals.
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` nor `--format` option is given on the
- command line.
+ there is no `--pretty`, `--format` nor `--oneline` option is
+ given on the command line.