From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 17 Jun 2024 22:55:56 +0000 (-0700)
Subject: Merge branch 'jk/am-retry'
X-Git-Tag: v2.46.0-rc0~53
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=42b8b5bfd04c993ceb4c79a995cf9f6851aee95b;p=thirdparty%2Fgit.git

Merge branch 'jk/am-retry'

"git am" has a safety feature to prevent it from starting a new
session when there already is a session going.  It reliably
triggers when a mbox is given on the command line, but it has to
rely on the tty-ness of the standard input.  Add an explicit way to
opt out of this safety with a command line option.

* jk/am-retry:
  test-terminal: drop stdin handling
  am: add explicit "--retry" option
---

42b8b5bfd04c993ceb4c79a995cf9f6851aee95b