]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 12029dc 509efef)
Merge branch 'am/pathspec-from-file'
authorJunio C Hamano <gitster@pobox.com>
Wed, 25 Dec 2019 19:21:57 +0000 (11:21 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 25 Dec 2019 19:21:57 +0000 (11:21 -0800)
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

1  2 
builtin/commit.c patch | diff1 | diff2 | blob | history

diff --cc builtin/commit.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.