/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/help_topics/en/configuration.txt

  • Committer: INADA Naoki
  • Date: 2011-05-18 06:27:34 UTC
  • mfrom: (5887 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5894.
  • Revision ID: songofacandy@gmail.com-20110518062734-1ilhll0rrqyyp8um
merge from lp:bzr and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/help_topics/en/configuration.txt
550
550
parent_location
551
551
~~~~~~~~~~~~~~~
552
552
 
553
 
If present, the location of the default branch for pull or merge.
554
 
This option is normally set by ``pull --remember`` or ``merge
 
553
If present, the location of the default branch for pull or merge.  This option
 
554
is normally set when creating a branch, the first ``pull`` or by ``pull
555
555
--remember``.
556
556
 
557
557
push_location
558
558
~~~~~~~~~~~~~
559
559
 
560
560
If present, the location of the default branch for push.  This option
561
 
is normally set by ``push --remember``.
 
561
is normally set by the first ``push`` or ``push --remember``.
562
562
 
563
563
push_strict
564
564
~~~~~~~~~~~