← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/option.py

[merge] bzr.dev 1491

Show diffs side-by-side

added added

removed removed

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