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 /builtin | |
| 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 'builtin')
| -rw-r--r-- | builtin/log.c | 2 | ||||
| -rw-r--r-- | builtin/shortlog.c | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/builtin/log.c b/builtin/log.c index ad46f72950..6e56a50002 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -37,7 +37,7 @@ static const char *fmt_patch_subject_prefix = "PATCH"; static const char *fmt_pretty; static const char * const builtin_log_usage[] = { - N_("git log [<options>] [<since>..<until>] [[--] <path>...]\n") + N_("git log [<options>] [<revision range>] [[--] <path>...]\n") N_(" or: git show [options] <object>..."), NULL }; diff --git a/builtin/shortlog.c b/builtin/shortlog.c index 240bff3efa..1fd6f8ac59 100644 --- a/builtin/shortlog.c +++ b/builtin/shortlog.c @@ -10,9 +10,7 @@ #include "parse-options.h" static char const * const shortlog_usage[] = { - N_("git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]"), - "", - N_("[rev-opts] are documented in git-rev-list(1)"), + N_("git shortlog [<options>] [<revision range>] [[--] [<path>...]]"), NULL }; |