Merge branch 'jk/end-of-options' into jc/sparse-checkout-set-add-end-of-options

* jk/end-of-options:
  parse-options: decouple "--end-of-options" and "--"

diff --cc parse-options.c
Simple merge

diff --cc t/t7102-reset.sh
Simple merge