]> git.ipfire.org Git - thirdparty/git.git/commit - builtin/reset.c
reset: support the `--pathspec-from-file` option
authorAlexandr Miloslavskiy <alexandr.miloslavskiy@syntevo.com>
Tue, 19 Nov 2019 16:48:53 +0000 (16:48 +0000)
committerJunio C Hamano <gitster@pobox.com>
Wed, 20 Nov 2019 04:01:53 +0000 (13:01 +0900)
commit64bac8df972782b3b3dd2841699f076c7573c1db
tree0df7fd0a541cbc542ea9196dfd7ee74c71d020c8
parentd137b5075660d633ef93342974350f1d0657a54c
reset: support the `--pathspec-from-file` option

Decisions taken for simplicity:
1) For now, `--pathspec-from-file` is declared incompatible with
   `--patch`, even when <file> is not `stdin`. Such use case it not
   really expected. Also, it is harder to support in `git commit`, so
   I decided to make it incompatible in all places.
2) It is not allowed to pass pathspec in both args and file.

Co-authored-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Alexandr Miloslavskiy <alexandr.miloslavskiy@syntevo.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-reset.txt
builtin/reset.c
t/t7107-reset-pathspec-file.sh [new file with mode: 0755]