Changes in v2: * removed the diff_flags_cleared singleton * eliminated the 'touched' parallel flags * pass structs by reference instead of by value Now that the 'touched' flags have been removed it may be valuable to go ahead and remove the macros all together (including making the flags lower case). If that's what we want to do, I can go ahead and send those patches out as a follow on to these. Brandon Williams (4): add, reset: use DIFF_OPT_SET macro to set a diff flag diff: convert flags to be stored in bitfields diff: add flag to indicate textconv was set via cmdline diff: remove touched flags builtin/add.c | 2 +- builtin/commit.c | 7 +++-- builtin/log.c | 3 +- builtin/reset.c | 2 +- diff-lib.c | 7 +++-- diff.c | 10 +++--- diff.h | 96 +++++++++++++++++++++++++++++++++----------------------- sequencer.c | 5 +-- 8 files changed, 77 insertions(+), 55 deletions(-) -- 2.15.0.403.gc27cc4dac6-goog