]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0739479 2dfdd70)
Merge branch 'bk/p4-prepare-p4-only-fix'
authorJunio C Hamano <gitster@pobox.com>
Tue, 2 Jun 2020 20:35:01 +0000 (13:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 2 Jun 2020 20:35:01 +0000 (13:35 -0700)
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

1  2 
git-p4.py patch | diff1 | diff2 | blob | history

diff --cc git-p4.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.