summaryrefslogtreecommitdiff
path: root/tests/conftest.py
diff options
context:
space:
mode:
authorKevin Van Brunt <kmvanbrunt@gmail.com>2019-05-13 23:59:03 -0400
committerGitHub <noreply@github.com>2019-05-13 23:59:03 -0400
commit3ee97d121887d3055fc6326b1d9bc290f5235866 (patch)
treef5695aece2c4e6173513da3f436df73099b88c09 /tests/conftest.py
parentcbf0313306c99c02f3c503f60d70df4bda2cce64 (diff)
parent6c051808d83b75108c0549acbc97fe2201f8de63 (diff)
downloadcmd2-git-3ee97d121887d3055fc6326b1d9bc290f5235866.tar.gz
Merge pull request #676 from python-cmd2/pipe_chaining
Pipe chaining
Diffstat (limited to 'tests/conftest.py')
-rw-r--r--tests/conftest.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/tests/conftest.py b/tests/conftest.py
index 56538718..9d55eb4d 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -77,13 +77,17 @@ optional arguments:
-o, --output-file FILE
output commands to a script file, implies -s
-t, --transcript TRANSCRIPT
- output commands and results to a transcript file, implies -s
+ output commands and results to a transcript file,
+ implies -s
-c, --clear clear all history
formatting:
- -s, --script output commands in script format, i.e. without command numbers
- -x, --expanded output expanded commands instead of entered command
- -v, --verbose display history and include expanded commands if they differ from the typed command
+ -s, --script output commands in script format, i.e. without command
+ numbers
+ -x, --expanded output fully parsed commands with any aliases and
+ macros expanded, instead of typed commands
+ -v, --verbose display history and include expanded commands if they
+ differ from the typed command
"""