~ubuntu-branches/ubuntu/lucid/bzr/lucid-proposed

« back to all changes in this revision

Viewing changes to bzrlib/option.py

Tags: upstream-0.7
ImportĀ upstreamĀ versionĀ 0.7

Show diffs side-by-side

added added

removed removed

Lines of Context:
191
191
_global_option('version')
192
192
_global_option('email')
193
193
_global_option('update')
194
 
_global_option('long')
 
194
_global_option('long', help='Use detailed log format')
 
195
_global_option('short', help='Use moderately short log format')
 
196
_global_option('line', help='Use log format with one line per revision')
195
197
_global_option('root', type=str)
196
198
_global_option('no-backup')
197
199
_global_option('merge-type', type=_parse_merge_type)
200
202
_global_option('remember', help='Remember the specified location as a'
201
203
               ' default.')
202
204
_global_option('reprocess', help='Reprocess to reduce spurious conflicts')
 
205
_global_option('kind', type=str)
 
206
_global_option('dry-run',
 
207
               help="show what would be done, but don't actually do anything")
203
208
 
204
209
 
205
210
def _global_short(short_name, long_name):