From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 2 Jun 2020 20:35:01 +0000 (-0700)
Subject: Merge branch 'bk/p4-prepare-p4-only-fix'
X-Git-Tag: v2.28.0-rc0~84
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7a8fec908a40bd009803de1617c90684e932f878;p=thirdparty%2Fgit.git

Merge branch 'bk/p4-prepare-p4-only-fix'

The "--prepare-p4-only" option is supposed to stop after replaying
one changeset, but kept going (by mistake?)

* bk/p4-prepare-p4-only-fix:
  git-p4.py: fix --prepare-p4-only error with multiple commits
---

7a8fec908a40bd009803de1617c90684e932f878