fcm-diff.pod 1.3 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879
  1. =head1 NAME
  2. fcm diff (di)
  3. =head1 SYNOPSIS
  4. 1. fcm diff --branch [OPTIONS] [TARGET]
  5. 2. fcm diff [OPTIONS] [ARGS]
  6. =over 4
  7. =item 1.
  8. Show differences relative to the base of the target branch, i.e. the changes
  9. available for merging from the target branch into its parent. If TARGET is
  10. specified, it must either be a URL or a working copy. Otherwise, the target is
  11. the the current directory which must be a working copy. The target URL must be a
  12. branch in a standard FCM project.
  13. =item 2.
  14. See description of "L<svn|svn> diff" below.
  15. =back
  16. =head1 OPTIONS
  17. Valid options with --branch:
  18. =over 4
  19. =item --diff-cmd arg
  20. As described below in the help for "L<svn|svn> diff".
  21. =item -g [--graphical]
  22. As described below.
  23. =item --summarise
  24. As described below
  25. =item --summarize
  26. As described below in the help for "L<svn|svn> diff".
  27. =item -t [--trac]
  28. If TARGET is a URL, use Trac to display the diff.
  29. =item --wiki
  30. If TARGET is a URL, print Trac link for the diff.
  31. =item -x [--extensions] arg
  32. As described below in the help for "L<svn|svn> diff".
  33. =back
  34. Other options:
  35. =over 4
  36. =item -g [--graphical]
  37. Use a graphical diff tool to display the differences. This option should not be
  38. used in combination with --diff-cmd.
  39. =item --summarise
  40. Same as --summarize as described below.
  41. =back
  42. For other options, see output of "L<svn|svn> help diff".
  43. =cut