Merge branch 'bs/maint-commit-options'

* bs/maint-commit-options:
  git-commit: Add tests for invalid usage of -a/--interactive with paths
  git-commit.sh: Fix usage checks regarding paths given when they do not make sense

diff --cc git-commit.sh
Simple merge

diff --cc t/t7501-commit.sh
Simple merge