Merge branch 'bk/p4-prepare-p4-only-fix'
commit7a8fec908a40bd009803de1617c90684e932f878
authorJunio C Hamano <gitster@pobox.com>
Tue, 2 Jun 2020 20:35:01 +0000 (2 13:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 2 Jun 2020 20:35:01 +0000 (2 13:35 -0700)
tree6d8d36eeaef8966a18b345dd778b5edc3a89c27f
parent0739479c6a2b02992037d7e816663d6782bfcd49
parent2dfdd705ffd8c6dd1ef75abdfb64e1a08ad35a26
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
git-p4.py