summaryrefslogtreecommitdiff
path: root/sequencer.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-05-07 13:29:08 -0700
committerJunio C Hamano <gitster@pobox.com>2012-05-07 13:29:08 -0700
commitfc1320bfe2419e5eb3f43761e27ffa4f42a81825 (patch)
treed164b4cfbf359242729fc180abba294c1eb169c1 /sequencer.c
parent43d1e41ea91ba95b902f549274916660bf520b98 (diff)
parent9380aed286df31dcb31fd6ae467b69471c8cf148 (diff)
downloadgit-fc1320bfe2419e5eb3f43761e27ffa4f42a81825.tar.gz
Merge branch 'zj/diff-empty-chmod'
"git diff --stat" used to fully count a binary file with modified execution bits whose contents is unmodified, which was not right. By Zbigniew Jędrzejewski-Szmek (4) and Johannes Sixt (1) * zj/diff-empty-chmod: t4006: Windows do not have /dev/zero diff --stat: do not run diff on indentical files diff --stat: report mode-only changes for binary files like text files tests: check --[short]stat output after chmod test: modernize style of t4006 Conflicts: diff.c
Diffstat (limited to 'sequencer.c')
0 files changed, 0 insertions, 0 deletions