diff options
| author | Justin Lebar <jlebar@google.com> | 2014-03-31 15:11:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-31 15:16:22 -0700 |
| commit | a58088abe2011b6f486de8acd54432f6d9bcecfc (patch) | |
| tree | fdae618dee73d4a349c80321896d4f4a58344c35 /Documentation/pretty-options.txt | |
| parent | cee0c2750bb5f1b38f15ef961517e03c2e39c9ec (diff) | |
| download | git-a58088abe2011b6f486de8acd54432f6d9bcecfc.tar.gz | |
Documentation: fix misuses of "nor"
Signed-off-by: Justin Lebar <jlebar@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/pretty-options.txt')
| -rw-r--r-- | Documentation/pretty-options.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/pretty-options.txt b/Documentation/pretty-options.txt index eea0e306a8..8569e29d08 100644 --- a/Documentation/pretty-options.txt +++ b/Documentation/pretty-options.txt @@ -39,7 +39,7 @@ 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`, `--format` nor `--oneline` option given + there is no `--pretty`, `--format`, or `--oneline` option given on the command line. + By default, the notes shown are from the notes refs listed in the |