From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 25 Dec 2019 19:21:57 +0000 (-0800)
Subject: Merge branch 'am/pathspec-from-file'
X-Git-Tag: v2.25.0-rc0~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ff0cb70d456f586c94f15daa67d2ff1bb8e75fb6;p=thirdparty%2Fgit.git

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

ff0cb70d456f586c94f15daa67d2ff1bb8e75fb6