]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'js/p4-default-branch'
authorJunio C Hamano <gitster@pobox.com>
Wed, 11 Nov 2020 21:18:38 +0000 (13:18 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 Nov 2020 21:18:38 +0000 (13:18 -0800)
"git p4" now honors init.defaultBranch configuration.

* js/p4-default-branch:
  p4: respect init.defaultBranch

1  2 
git-p4.py

diff --cc git-p4.py
Simple merge