diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-04-26 15:28:39 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-04-26 15:28:39 -0700 |
commit | 2a407d7443b0ff2832f0bad0db0dd5b1858fde8d (patch) | |
tree | f4ddd4c4e2df16451a408f63b6c8176592258ebc /Documentation/revisions.txt | |
parent | f44014b74de5762627d48128255b94daefdb8dfb (diff) | |
parent | 0942d519ada52c9cf831ecd3c562539be939d19e (diff) | |
download | git-2a407d7443b0ff2832f0bad0db0dd5b1858fde8d.tar.gz |
Merge branch 'rr/shortlog-doc'
Update documentation for "log" and "shortlog".
* rr/shortlog-doc:
builtin/shortlog.c: make usage string consistent with log
builtin/log.c: make usage string consistent with doc
git-shortlog.txt: make SYNOPSIS match log, update OPTIONS
git-log.txt: rewrite note on why "--" may be required
git-log.txt: generalize <since>..<until>
git-log.txt: order OPTIONS properly; move <since>..<until>
revisions.txt: clarify the .. and ... syntax
git-shortlog.txt: remove (-h|--help) from OPTIONS
Diffstat (limited to 'Documentation/revisions.txt')
-rw-r--r-- | Documentation/revisions.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt index a8ff691492..d477b3f6bc 100644 --- a/Documentation/revisions.txt +++ b/Documentation/revisions.txt @@ -244,11 +244,13 @@ To summarize: '<rev1>..<rev2>':: Include commits that are reachable from <rev2> but exclude - those that are reachable from <rev1>. + those that are reachable from <rev1>. When either <rev1> or + <rev2> is omitted, it defaults to 'HEAD'. '<rev1>\...<rev2>':: Include commits that are reachable from either <rev1> or - <rev2> but exclude those that are reachable from both. + <rev2> but exclude those that are reachable from both. When + either <rev1> or <rev2> is omitted, it defaults to 'HEAD'. '<rev>{caret}@', e.g. 'HEAD{caret}@':: A suffix '{caret}' followed by an at sign is the same as listing |