]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ce22ea2 09667d0)
Merge branch 'ao/p4-has-branch-prefix-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 11 Jul 2016 17:44:16 +0000 (10:44 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 11 Jul 2016 17:44:16 +0000 (10:44 -0700)
commit8e3e28b2f320d27242a2728e48fad27f5f7f2f21
treeb72b262102aa6e2bcfffbbca38f274295925761etree | snapshot
parentce22ea22e863e100529334b02b2899780d2c9dcccommit | diff
parent09667d013c91124ac0ff870322e184f0de53744fcommit | diff
Merge branch 'ao/p4-has-branch-prefix-fix' into maint

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.