diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-05-07 13:29:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-07 13:29:08 -0700 |
| commit | fc1320bfe2419e5eb3f43761e27ffa4f42a81825 (patch) | |
| tree | d164b4cfbf359242729fc180abba294c1eb169c1 /Documentation/howto/separating-topic-branches.txt | |
| parent | Merge branch 'jk/maint-tformat-with-z' (diff) | |
| parent | t4006: Windows do not have /dev/zero (diff) | |
| download | tgif-fc1320bfe2419e5eb3f43761e27ffa4f42a81825.tar.xz | |
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 'Documentation/howto/separating-topic-branches.txt')
0 files changed, 0 insertions, 0 deletions