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-formats.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-formats.txt')
| -rw-r--r-- | Documentation/pretty-formats.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt index 1d174fd0b6..85d63532a3 100644 --- a/Documentation/pretty-formats.txt +++ b/Documentation/pretty-formats.txt @@ -78,7 +78,7 @@ The 'raw' format shows the entire commit exactly as stored in the commit object. Notably, the SHA-1s are displayed in full, regardless of whether --abbrev or --no-abbrev are used, and 'parents' information show the -true parent commits, without taking grafts nor history +true parent commits, without taking grafts or history simplification into account. * 'format:<string>' |