diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-02-05 14:26:17 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-05 14:26:17 -0800 |
| commit | 5d2710bd3c706c3375991972b630f9419551f24e (patch) | |
| tree | 8f50b388a223e1f63c8624fc9d4dfbc23f0b069d /object.c | |
| parent | Merge branch 'bp/checkout-new-branch-optim' (diff) | |
| parent | combine-diff: treat --dirstat like --stat (diff) | |
| download | git-5d2710bd3c706c3375991972b630f9419551f24e.tar.gz git-5d2710bd3c706c3375991972b630f9419551f24e.zip | |
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
Diffstat (limited to 'object.c')
0 files changed, 0 insertions, 0 deletions