← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/option.py

  • Committer: John Arbash Meinel
  • Date: 2006-03-08 14:31:23 UTC
  • mfrom: (1598 +trunk)
  • mto: (1685.1.1 bzr-encoding)
  • mto: This revision was merged to the branch mainline in revision 1752.
  • Revision ID: john@arbash-meinel.com-20060308143123-448308b0db4de410
[merge] bzr.dev 1573, lots of updates

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/option.py
161
161
_global_option('overwrite', help='Ignore differences between branches and '
162
162
               'overwrite unconditionally')
163
163
_global_option('basis', type=str)
 
164
_global_option('bound')
164
165
_global_option('diff-options', type=str)
165
166
_global_option('help',
166
167
               help='show help message')
179
180
_global_option('timezone', 
180
181
               type=str,
181
182
               help='display timezone as local, original, or utc')
 
183
_global_option('unbound')
182
184
_global_option('verbose',
183
185
               help='display more information')
184
186
_global_option('version')
185
187
_global_option('email')
186
188
_global_option('update')
187
 
_global_option('long', help='Use detailed log format')
188
 
_global_option('short', help='Use moderately short log format')
189
 
_global_option('line', help='Use log format with one line per revision')
 
189
_global_option('log-format', type=str, help="Use this log format")
 
190
_global_option('long', help='Use detailed log format. Same as --log-format long')
 
191
_global_option('short', help='Use moderately short log format. Same as --log-format short')
 
192
_global_option('line', help='Use log format with one line per revision. Same as --log-format line')
190
193
_global_option('root', type=str)
191
194
_global_option('no-backup')
192
195
_global_option('merge-type', type=_parse_merge_type)