| commit | 8cc633286a4803025d84b77c808a2c7ad8616f2f | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 9 Nov 2017 05:31:27 +0000 (9 14:31 +0900) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 9 Nov 2017 05:31:27 +0000 (9 14:31 +0900) | ||
| tree | 624047e4917cd5113dad8f487dd8dec21985c775 | treesnapshot (tar.gz zip) |
| parent | bde13700105a1c945819578ce8d5c0627d52c741 | commitdiff |
| parent | 0d1e0e7801bb2ae22036ad09f9f5cec17e08c48b | commitdiff |
Merge branch 'bw/diff-opt-impl-to-bitfields'
A single-word "unsigned flags" in the diff options is being split
into a structure with many bitfields.
* bw/diff-opt-impl-to-bitfields:
diff: make struct diff_flags members lowercase
diff: remove DIFF_OPT_CLR macro
diff: remove DIFF_OPT_SET macro
diff: remove DIFF_OPT_TST macro
diff: remove touched flags
diff: add flag to indicate textconv was set via cmdline
diff: convert flags to be stored in bitfields
add, reset: use DIFF_OPT_SET macro to set a diff flag
A single-word "unsigned flags" in the diff options is being split
into a structure with many bitfields.
* bw/diff-opt-impl-to-bitfields:
diff: make struct diff_flags members lowercase
diff: remove DIFF_OPT_CLR macro
diff: remove DIFF_OPT_SET macro
diff: remove DIFF_OPT_TST macro
diff: remove touched flags
diff: add flag to indicate textconv was set via cmdline
diff: convert flags to be stored in bitfields
add, reset: use DIFF_OPT_SET macro to set a diff flag
20 files changed: