]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4cea655 09667d0)
Merge branch 'ao/p4-has-branch-prefix-fix'
authorJunio C Hamano <gitster@pobox.com>
Wed, 6 Jul 2016 20:38:19 +0000 (13:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 Jul 2016 20:38:19 +0000 (13:38 -0700)
commit3efeb513281ed59cc4c62be53256fd59832caa23
tree03503031e7e0f43454127ba52e3e69643795659etree | snapshot
parent4cea655a470bdea8dfd9468c6b5b7f667ba9bf02commit | diff
parent09667d013c91124ac0ff870322e184f0de53744fcommit | diff
Merge branch 'ao/p4-has-branch-prefix-fix'

A bug, which caused "git p4" while running under verbose mode to
report paths that are omitted due to branch prefix incorrectly, has
been fixed; the command said "Ignoring file outside of prefix" for
paths that are _inside_.

* ao/p4-has-branch-prefix-fix:
  git-p4: correct hasBranchPrefix verbose output
git-p4.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.