← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/help_topics/en/configuration.txt

  • Committer: Andrew Bennetts
  • Date: 2009-07-27 05:35:00 UTC
  • mfrom: (4570 +trunk)
  • mto: (4634.6.29 2.0)
  • mto: This revision was merged to the branch mainline in revision 4680.
  • Revision ID: andrew.bennetts@canonical.com-20090727053500-q76zsn2dx33jhmj5
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/help_topics/en/configuration.txt
1
1
Configuration Settings
2
2
=======================
3
3
 
4
 
.. TODO: Should have some explanation of why you'd want things in
5
 
.. branch.conf.
6
 
 
7
 
 
8
4
Environment settings
9
5
---------------------
10
6
 
228
224
Common variable options
229
225
-----------------------
230
226
 
 
227
debug_flags
 
228
~~~~~~~~~~~
 
229
 
 
230
A comma-separated list of debugging options to turn on.  The same values
 
231
can be used as with the -D command-line option (see `help global-options`).
 
232
For example::
 
233
 
 
234
    debug_flags = hpss
 
235
 
231
236
email
232
237
~~~~~
233
238
 
399
404
If present, the location of the default branch for push.  This option
400
405
is normally set by ``push --remember``.
401
406
 
 
407
push_strict
 
408
~~~~~~~~~~~
 
409
 
 
410
If present, defines the ``--strict`` option default value for checking
 
411
uncommitted changes before pushing.
 
412
 
402
413
bound_location
403
414
~~~~~~~~~~~~~~
404
415
 
410
421
 
411
422
If set to "True", the branch should act as a checkout, and push each commit to
412
423
the bound_location.  This option is normally set by ``bind``/``unbind``.
 
424
 
 
425
send_strict
 
426
~~~~~~~~~~~
 
427
 
 
428
If present, defines the ``--strict`` option default value for checking
 
429
uncommitted changes before sending a merge directive.
 
430