]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'am/pathspec-from-file'
authorJunio C Hamano <gitster@pobox.com>
Tue, 10 Dec 2019 21:11:40 +0000 (13:11 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 10 Dec 2019 21:11:41 +0000 (13:11 -0800)
A few commands learned to take the pathspec from the
standard input or a named file, instead of taking it as the command
line arguments.

* am/pathspec-from-file:
  commit: support the --pathspec-from-file option
  doc: commit: synchronize <pathspec> description
  reset: support the `--pathspec-from-file` option
  doc: reset: synchronize <pathspec> description
  pathspec: add new function to parse file
  parse-options.h: add new options `--pathspec-from-file`, `--pathspec-file-nul`

1  2 
builtin/commit.c
builtin/reset.c

Simple merge
diff --cc builtin/reset.c
Simple merge