Junio C Hamano 5d2710bd3c Merge branch 'jk/diff-cc-stat-fixes' ...

"git diff --color-moved --cc --stat -p" did not work well due to
funny interaction between a bug in color-moved and the rest, which
has been fixed.

* jk/diff-cc-stat-fixes:
  combine-diff: treat --dirstat like --stat
  combine-diff: treat --summary like --stat
  combine-diff: treat --shortstat like --stat
  combine-diff: factor out stat-format mask
  diff: clear emitted_symbols flag after use
  t4006: resurrect commented-out tests

2019-02-05 14:26:17 -08:00

41 KiB

Raw Blame History

View Raw