diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-11-29 12:53:54 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-11-29 12:53:54 -0800 |
commit | a4eab8f38ec174abe5eeab8649953460d80d634c (patch) | |
tree | 1f2d2f50ceee4b45c5732841cc65d0bef95724aa /Documentation/RelNotes/1.5.3.3.txt | |
parent | Merge branch 'fc/remote-hg' (diff) | |
parent | t4049: refocus tests (diff) | |
download | tgif-a4eab8f38ec174abe5eeab8649953460d80d634c.tar.xz |
Merge branch 'lt/diff-stat-show-0-lines'
"git diff --stat" miscounted the total number of changed lines when
binary files were involved and hidden beyond --stat-count. It also
miscounted the total number of changed files when there were
unmerged paths.
* lt/diff-stat-show-0-lines:
t4049: refocus tests
diff --shortstat: do not count "unmerged" entries
diff --stat: do not count "unmerged" entries
diff --stat: move the "total count" logic to the last loop
diff --stat: use "file" temporary variable to refer to data->files[i]
diff --stat: status of unmodified pair in diff-q is not zero
test: add failing tests for "diff --stat" to t4049
Diffstat (limited to 'Documentation/RelNotes/1.5.3.3.txt')
0 files changed, 0 insertions, 0 deletions