git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 412a79f e7d7a56)
Merge branch 'va/git-p4-branch'
authorJunio C Hamano <redacted>
Wed, 1 Feb 2012 06:01:16 +0000 (22:01 -0800)
committerJunio C Hamano <redacted>
Wed, 1 Feb 2012 06:01:16 +0000 (22:01 -0800)
* va/git-p4-branch:
  t9801: do not overuse test_must_fail
  git-p4: Change p4 command invocation
  git-p4: Add test case for complex branch import
  git-p4: Search for parent commit on branch creation

1  2 
contrib/fast-import/git-p4 patch | diff1 | diff2 | blob | history

diff --cc contrib/fast-import/git-p4
Simple merge
git clone https://git.99rst.org/PROJECT