tree 0b59125cda2d1a4beba3a1410599223ba856f371
parent 12029dc57db23baef008e77db1909367599210ee
parent 509efef789de51f5d68e5c9799918f9a5ea09670
author Junio C Hamano <gitster@pobox.com> 1577301717 -0800
committer Junio C Hamano <gitster@pobox.com> 1577301717 -0800

Merge branch 'am/pathspec-from-file'

An earlier series to teach "--pathspec-from-file" to "git commit"
forgot to make the option incompatible with "--all", which has been
corrected.

* am/pathspec-from-file:
  commit: forbid --pathspec-from-file --all