/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 doc/en/user-guide/configuring_bazaar.txt

  • Committer: John Arbash Meinel
  • Date: 2008-07-09 21:42:24 UTC
  • mto: This revision was merged to the branch mainline in revision 3543.
  • Revision ID: john@arbash-meinel.com-20080709214224-r75k87r6a01pfc3h
Restore a real weave merge to 'bzr merge --weave'.

To do so efficiently, we only add the simple LCAs to the final weave
object, unless we run into complexities with the merge graph.
This gives the same effective result as adding all the texts,
with the advantage of not having to extract all of them.

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/user-guide/configuring_bazaar.txt
13
13
identifier you want::
14
14
 
15
15
    % bzr whoami "Your Name <email@example.com>"
16
 
 
 
16
 
17
17
If ``whoami`` is used without an argument, the current value is displayed.
18
18
 
19
19
Configuration files
46
46
For further details on the syntax and configuration settings supported, see
47
47
`Configuration Settings <../user-reference/bzr_man.html#configuration-settings>`_
48
48
in the Bazaar User Reference.
49
 
 
50
 
 
51
 
Rule-based preferences
52
 
----------------------
53
 
 
54
 
Some commands and plugins provide custom processing on files matching
55
 
certain patterns. Per-user rule-based preferences are defined in
56
 
``BZR_HOME/rules``.
57
 
 
58
 
For further information on how rules are searched and the detailed syntax of
59
 
the relevant files, see `Rules <../user-reference/bzr_man.html#rules>`_
60
 
in the Bazaar User Reference.