diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-08-05 13:00:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-08-05 13:00:20 -0700 |
| commit | fb5657082148297b61fbca7e64d51c1e7870309a (patch) | |
| tree | 14ab782877318041066b734607db98c4b4c6c362 /Documentation/rev-list-options.txt | |
| parent | f5206f1239a2f193aed16bac1c3b8cf71dfbce39 (diff) | |
| parent | 0bf5ce4ef27dd24461d7b7b8049058bf80301ddf (diff) | |
| download | git-fb5657082148297b61fbca7e64d51c1e7870309a.tar.gz | |
Sync with maint to grab trivial doc fixes
* maint:
fix typo in documentation of git-svn
Documentation/rev-list-options: add missing word in --*-parents
log doc: the argument to --encoding is not optional
Diffstat (limited to 'Documentation/rev-list-options.txt')
| -rw-r--r-- | Documentation/rev-list-options.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt index 27f8de3d86..5bdfb42852 100644 --- a/Documentation/rev-list-options.txt +++ b/Documentation/rev-list-options.txt @@ -119,7 +119,7 @@ if it is part of the log message. --no-min-parents:: --no-max-parents:: - Show only commits which have at least (or at most) that many + Show only commits which have at least (or at most) that many parent commits. In particular, `--max-parents=1` is the same as `--no-merges`, `--min-parents=2` is the same as `--merges`. `--max-parents=0` gives all root commits and `--min-parents=3` all octopus merges. |