summaryrefslogtreecommitdiff
path: root/Documentation/rev-list-options.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-04-09 12:03:26 -0700
committerJunio C Hamano <gitster@pobox.com>2014-04-09 12:03:26 -0700
commit3c9e56b75c4a9a6832d94a00f079ea68e8a281ca (patch)
tree5f5b11703f64319bcb71603c825d382f4703a763 /Documentation/rev-list-options.txt
parentfbae3d9ace0b71f8db62cde127fa6fe24c40380c (diff)
parent235e8d591480d7e1378c27fe65c5529625d4b5be (diff)
downloadgit-3c9e56b75c4a9a6832d94a00f079ea68e8a281ca.tar.gz
Merge branch 'jl/nor-or-nand-and' into maint
* jl/nor-or-nand-and: code and test: fix misuses of "nor" comments: fix misuses of "nor" contrib: fix misuses of "nor" Documentation: fix misuses of "nor"
Diffstat (limited to 'Documentation/rev-list-options.txt')
-rw-r--r--Documentation/rev-list-options.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index 03533af715..47c8dcca9d 100644
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -237,7 +237,7 @@ list.
reflog entries from the most recent one to older ones.
When this option is used you cannot specify commits to
exclude (that is, '{caret}commit', 'commit1..commit2',
- nor 'commit1\...commit2' notations cannot be used).
+ and 'commit1\...commit2' notations cannot be used).
+
With `--pretty` format other than `oneline` (for obvious reasons),
this causes the output to have two extra lines of information