diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-04-19 22:41:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-04-19 22:41:30 -0700 |
| commit | ddd02b70f0d80fc3cac6b2f2c42005560d572413 (patch) | |
| tree | 0bd6765c742b6622b6d81587b6ddd98d5062e9eb /builtin | |
| parent | Git 1.7.1-rc2 (diff) | |
| parent | t7012: Mark missing tests as TODO (diff) | |
| download | tgif-ddd02b70f0d80fc3cac6b2f2c42005560d572413.tar.xz | |
Merge branch 'maint'
* maint:
t7012: Mark missing tests as TODO
reflog: remove 'show' from 'expire's usage string
MSVC: Fix build by adding missing termios.h dummy
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/reflog.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/reflog.c b/builtin/reflog.c index 64e45bd813..bd7880dc04 100644 --- a/builtin/reflog.c +++ b/builtin/reflog.c @@ -13,7 +13,7 @@ */ static const char reflog_expire_usage[] = -"git reflog (show|expire) [--verbose] [--dry-run] [--stale-fix] [--expire=<time>] [--expire-unreachable=<time>] [--all] <refs>..."; +"git reflog expire [--verbose] [--dry-run] [--stale-fix] [--expire=<time>] [--expire-unreachable=<time>] [--all] <refs>..."; static const char reflog_delete_usage[] = "git reflog delete [--verbose] [--dry-run] [--rewrite] [--updateref] <refs>..."; |