diff options
author | Junio C Hamano <gitster@pobox.com> | 2022-02-16 23:14:30 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-02-16 23:14:30 (GMT) |
commit | 9a160990ef3a16fab8d54752d0d9b981d15b00c5 (patch) | |
tree | 8c8fdf47b518062223f49fb1105879c5ba3a06cc /diff.h | |
parent | 70ff41ffcf93aed8198368af435b0c53fe55ed05 (diff) | |
parent | 75408ca94980c125b3a800003c3e6b7cdcb27d44 (diff) | |
download | git-9a160990ef3a16fab8d54752d0d9b981d15b00c5.zip git-9a160990ef3a16fab8d54752d0d9b981d15b00c5.tar.gz git-9a160990ef3a16fab8d54752d0d9b981d15b00c5.tar.bz2 |
Merge branch 'js/diff-filter-negation-fix'
"git diff --diff-filter=aR" is now parsed correctly.
* js/diff-filter-negation-fix:
diff-filter: be more careful when looking for negative bits
diff.c: move the diff filter bits definitions up a bit
docs(diff): lose incorrect claim about `diff-files --diff-filter=A`
Diffstat (limited to 'diff.h')
-rw-r--r-- | diff.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -283,7 +283,7 @@ struct diff_options { struct diff_flags flags; /* diff-filter bits */ - unsigned int filter; + unsigned int filter, filter_not; int use_color; |