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`
This commit is contained in:
Junio C Hamano
2022-02-16 15:14:30 -08:00
4 changed files with 60 additions and 59 deletions

2
diff.h
View File

@ -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;