summaryrefslogtreecommitdiff
path: root/builtin/log.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-04-26 22:28:39 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-04-26 22:28:39 (GMT)
commit2a407d7443b0ff2832f0bad0db0dd5b1858fde8d (patch)
treef4ddd4c4e2df16451a408f63b6c8176592258ebc /builtin/log.c
parentf44014b74de5762627d48128255b94daefdb8dfb (diff)
parent0942d519ada52c9cf831ecd3c562539be939d19e (diff)
downloadgit-2a407d7443b0ff2832f0bad0db0dd5b1858fde8d.zip
git-2a407d7443b0ff2832f0bad0db0dd5b1858fde8d.tar.gz
git-2a407d7443b0ff2832f0bad0db0dd5b1858fde8d.tar.bz2
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/log.c')
-rw-r--r--builtin/log.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/log.c b/builtin/log.c
index ad46f72..6e56a50 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
};