~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to tutorial.txt

  • Committer: Martin Pool
  • Date: 2006-05-04 06:03:00 UTC
  • mto: This revision was merged to the branch mainline in revision 1699.
  • Revision ID: mbp@sourcefrog.net-20060504060300-eed0e79351fd6182
Add -p0, -p1 options for diff.

Change --diff-prefix to just --prefix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
246
246
 
247
247
    % bzr diff --diff-options --side-by-side foo
248
248
 
 
249
Some projects prefer patches to show a prefix at the start of the path for
 
250
old and new files.  The --prefix option can be used to provide such a prefix. 
 
251
As a shortcut, ``bzr diff -p1`` produces a form that works with the 
 
252
command ``patch -p1``.
 
253
 
249
254
Committing changes
250
255
==================
251
256