summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-02-16 23:14:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2022-02-16 23:14:30 (GMT)
commit9a160990ef3a16fab8d54752d0d9b981d15b00c5 (patch)
tree8c8fdf47b518062223f49fb1105879c5ba3a06cc /diff.h
parent70ff41ffcf93aed8198368af435b0c53fe55ed05 (diff)
parent75408ca94980c125b3a800003c3e6b7cdcb27d44 (diff)
downloadgit-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.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/diff.h b/diff.h
index ce9e2cf..8ae18e5 100644
--- a/diff.h
+++ b/diff.h
@@ -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;