diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-08-25 21:57:08 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-25 21:57:08 (GMT) |
| commit | 424f89f098a045785471cccb4f7307cc5b05bc54 (patch) | |
| tree | 4b66be6c50db9e6f52ed8932bdfca4d74d411e9c /lockfile.c | |
| parent | 080cc646637f20494138c62fe6b8b0fee8d521fa (diff) | |
| parent | b5e823594cff190bc18361207a89b08d57b038d7 (diff) | |
| download | git-424f89f098a045785471cccb4f7307cc5b05bc54.zip git-424f89f098a045785471cccb4f7307cc5b05bc54.tar.gz git-424f89f098a045785471cccb4f7307cc5b05bc54.tar.bz2 | |
Merge branch 'pt/am-builtin-options'
After "git am --opt1" stops, running "git am --opt2" pays attention
to "--opt2" only for the patch that caused the original invocation
to stop.
* pt/am-builtin-options:
am: let --signoff override --no-signoff
am: let command-line options override saved options
test_terminal: redirect child process' stdin to a pty
Diffstat (limited to 'lockfile.c')
0 files changed, 0 insertions, 0 deletions