| commit | 424f89f098a045785471cccb4f7307cc5b05bc54 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 25 Aug 2015 21:57:08 +0000 (25 14:57 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 25 Aug 2015 21:57:08 +0000 (25 14:57 -0700) | ||
| tree | 4b66be6c50db9e6f52ed8932bdfca4d74d411e9c | treesnapshot (tar.gz zip) |
| parent | 080cc646637f20494138c62fe6b8b0fee8d521fa | commitdiff |
| parent | b5e823594cff190bc18361207a89b08d57b038d7 | commitdiff |
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
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