Junio C Hamano d28fc7eebf Merge branch 'th/diff' into next ...

* th/diff:
  t4013: note improvements brought by the new output code.
  format-patch: fix diff format option implementation
  t4013 test updates for new output code.
  combine-diff.c: type sanity.
  Fix some more diff options changes.
  Fix diff-tree -s
  log --raw: Don't descend into subdirectories by default
  diff-tree: Use ---\n as a message separator
  Print empty line between raw, stat, summary and patch
  whatchanged: Default to DIFF_FORMAT_RAW
  Don't xcalloc() struct diffstat_t
  Add msg_sep to diff_options
  DIFF_FORMAT_RAW is not default anymore
  Set default diff output format after parsing command line
  Make --raw option available for all diff commands
  Merge with_raw, with_stat and summary variables to output_format

2006-06-29 14:14:28 -07:00

60 KiB

Raw Blame History

View Raw