diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-08-05 23:37:24 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-05 23:37:24 +0400 |
| commit | f0df1293acdba9513cae17e2c63b4169f1347371 (patch) | |
| tree | e4d9309caa37b13a21ad38147833ed7ee29479bd /builtin-reflog.c | |
| parent | 46068383aa825dfe9026f9255cea07da07e06253 (diff) | |
| parent | e77095e8b8d541b41c242aa6dbc8319cb99def5e (diff) | |
Merge branch 'maint-1.6.3' into maint
* maint-1.6.3:
Better usage string for reflog.
hg-to-git: don't import the unused popen2 module
send-email: remove debug trace
config: Keep inner whitespace verbatim
Diffstat (limited to 'builtin-reflog.c')
| -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 ddfdf5a3cb..95198c5de4 100644 --- a/builtin-reflog.c +++ b/builtin-reflog.c @@ -694,7 +694,7 @@ static int cmd_reflog_delete(int argc, const char **argv, const char *prefix) */ static const char reflog_usage[] = -"git reflog (expire | ...)"; +"git reflog [ show | expire | delete ]"; int cmd_reflog(int argc, const char **argv, const char *prefix) { |