diff options
author | Michael DeHaan <michael@ansibleworks.com> | 2013-06-30 19:31:37 -0400 |
---|---|---|
committer | Michael DeHaan <michael@ansibleworks.com> | 2013-06-30 19:31:37 -0400 |
commit | c2988dfdb0396cab4f2863bbabbdb971d999932b (patch) | |
tree | 3161927f2da48da2fe3c013a300feedd2c9326fa /bin/ansible-pull | |
parent | c9b6f0d0f29b1cd1234d5b803ad56bf348ade5ad (diff) | |
parent | dc984d94ac6828803db2443439dd16ab20058b54 (diff) | |
download | ansible-c2988dfdb0396cab4f2863bbabbdb971d999932b.tar.gz |
Merge branch 'option-updates' of git://github.com/jlund/ansible into devel
Conflicts:
bin/ansible-pull
Diffstat (limited to 'bin/ansible-pull')
-rwxr-xr-x | bin/ansible-pull | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/bin/ansible-pull b/bin/ansible-pull index 06ed41d0d6..84c385b8a0 100755 --- a/bin/ansible-pull +++ b/bin/ansible-pull @@ -98,18 +98,18 @@ def main(args): usage = "%prog [options] [playbook.yml]" parser = OptionParser(usage=usage) parser.add_option('--purge', default=False, action='store_true', - help='Purge git checkout after playbook run') + help='purge git checkout after playbook run') parser.add_option('-o', '--only-if-changed', dest='ifchanged', default=False, action='store_true', - help='Only run the playbook if the repository has been updated') + help='only run the playbook if the repository has been updated') parser.add_option('-d', '--directory', dest='dest', default=None, - help='Directory to clone git repository to') + help='directory to clone the git repository to') parser.add_option('-U', '--url', dest='url', default=None, - help='URL of git repository') + help='URL of the git repository') parser.add_option('-C', '--checkout', dest='checkout', default="HEAD", - help='Branch/Tag/Commit to checkout. Defaults to HEAD.') + help='branch/tag/commit to checkout; defaults to HEAD') parser.add_option('-i', '--inventory-file', dest='inventory', - help="specify inventory host file") + help="location of the inventory host file") options, args = parser.parse_args(args) if not options.dest: |