From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 25 Aug 2015 21:57:08 +0000 (-0700)
Subject: Merge branch 'pt/am-builtin-options'
X-Git-Tag: v2.6.0-rc0~47
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/424f89f098a045785471cccb4f7307cc5b05bc54

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
---

424f89f098a045785471cccb4f7307cc5b05bc54