← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/option.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-02-18 02:33:47 UTC
  • mfrom: (1534.1.24 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20060218023347-0952c65f668bfd68
Merge Robert Collins integration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/option.py
184
184
_global_option('version')
185
185
_global_option('email')
186
186
_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')
 
187
_global_option('log-format', type=str, help="Use this log format")
 
188
_global_option('long', help='Use detailed log format. Same as --log-format long')
 
189
_global_option('short', help='Use moderately short log format. Same as --log-format short')
 
190
_global_option('line', help='Use log format with one line per revision. Same as --log-format line')
190
191
_global_option('root', type=str)
191
192
_global_option('no-backup')
192
193
_global_option('merge-type', type=_parse_merge_type)