diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-02-05 22:26:17 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-02-05 22:26:17 (GMT) |
commit | 5d2710bd3c706c3375991972b630f9419551f24e (patch) | |
tree | 8f50b388a223e1f63c8624fc9d4dfbc23f0b069d /help.c | |
parent | 5ad3550f026d7ea1b96e699fdf072b642e8a4b8b (diff) | |
parent | dac03b5518a053e52ed7ee20925970728d3ae4c3 (diff) | |
download | git-5d2710bd3c706c3375991972b630f9419551f24e.zip git-5d2710bd3c706c3375991972b630f9419551f24e.tar.gz git-5d2710bd3c706c3375991972b630f9419551f24e.tar.bz2 |
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 'help.c')
0 files changed, 0 insertions, 0 deletions