/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Robert Collins
  • Date: 2010-05-06 11:08:10 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506110810-h3j07fh5gmw54s25
Cleaner matcher matching revised unlocking protocol.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
3073
3073
                         "the master branch until a normal commit "
3074
3074
                         "is performed."
3075
3075
                    ),
3076
 
             Option('show-diff',
 
3076
             Option('show-diff', short_name='p',
3077
3077
                    help='When no message is supplied, show the diff along'
3078
3078
                    ' with the status summary in the message editor.'),
3079
3079
             ]
4681
4681
 
4682
4682
class cmd_bind(Command):
4683
4683
    __doc__ = """Convert the current branch into a checkout of the supplied branch.
 
4684
    If no branch is supplied, rebind to the last bound location.
4684
4685
 
4685
4686
    Once converted into a checkout, commits must succeed on the master branch
4686
4687
    before they will be applied to the local branch.