diff options
author | Alexandr Miloslavskiy <alexandr.miloslavskiy@syntevo.com> | 2019-11-19 16:48:53 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-11-20 13:01:53 +0900 |
commit | 64bac8df972782b3b3dd2841699f076c7573c1db (patch) | |
tree | 0df7fd0a541cbc542ea9196dfd7ee74c71d020c8 /t/t3311-notes-merge-fanout.sh | |
parent | doc: reset: synchronize <pathspec> description (diff) | |
download | tgif-64bac8df972782b3b3dd2841699f076c7573c1db.tar.xz |
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>
Diffstat (limited to 't/t3311-notes-merge-fanout.sh')
0 files changed, 0 insertions, 0 deletions