diff options
author | Dave Brolley <brolley@redhat.com> | 2009-04-23 14:16:36 -0400 |
---|---|---|
committer | Dave Brolley <brolley@redhat.com> | 2009-04-23 14:16:36 -0400 |
commit | fb6d28283bd7ea63364a008d32c53687a694642f (patch) | |
tree | aa2d8faf381be8ba016cf4fb18a4d01da464ac60 /main.cxx | |
parent | e8aa2f848123598fa8c2110804b250cba1286271 (diff) | |
parent | 819ec23db74427d0249596959c938673f424f831 (diff) | |
download | systemtap-steved-fb6d28283bd7ea63364a008d32c53687a694642f.tar.gz systemtap-steved-fb6d28283bd7ea63364a008d32c53687a694642f.tar.xz systemtap-steved-fb6d28283bd7ea63364a008d32c53687a694642f.zip |
Merge branch 'master' of git://sources.redhat.com/git/systemtap
Conflicts:
Makefile.in
Diffstat (limited to 'main.cxx')
-rw-r--r-- | main.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -109,8 +109,7 @@ usage (systemtap_session& s, int exitcode) << " -m MODULE set probe module name, instead of " << endl << " " << s.module_name << endl << " -o FILE send script output to file, instead of stdout. This supports" << endl - << " a subset of strftime(3) (%%,%C,%Y,%y,%m,%d,%e,%F,%H,%I,%j,%k," << endl - << " %l,%M,%S,%R,%T,%u,%w) for FILE." << endl + << " strftime(3) formats for FILE" << endl << " -c CMD start the probes, run CMD, and exit when it finishes" << endl << " -x PID sets target() to PID" << endl << " -F run as on-file flight recorder with -o." << endl |