]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 331fe94 cd88410)
Merge branch 'va/p4-client-path'
authorJunio C Hamano <gitster@pobox.com>
Mon, 11 May 2015 21:23:48 +0000 (14:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 11 May 2015 21:23:48 +0000 (14:23 -0700)
commit04959836795da4c82bc9b12bebdfb294ea12943f
tree1e8ddc2a9abb9ccc9fedc49777047aebb30069e9tree | snapshot
parent331fe94fedb40851de29f0954026c705118102b3commit | diff
parentcd88410618d9068f17ba5de0f9959e4ec4f42789commit | diff
Merge branch 'va/p4-client-path'

git p4 attempts to better handle branches in Perforce.

* va/p4-client-path:
  git-p4: improve client path detection when branches are used
  t9801: check git-p4's branch detection with client spec enabled
git-p4.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.