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`

diff --cc Documentation/diff-options.txt
Simple merge

diff --cc diff.c
Simple merge

diff --cc diff.h
Simple merge

diff --cc t/t4202-log.sh
Simple merge