git-p4: add submit --conflict option and config varaiable
authorPete Wyckoff <pw@padd.com>
Sun, 9 Sep 2012 20:16:13 +0000 (16:16 -0400)
committerJunio C Hamano <gitster@pobox.com>
Mon, 17 Sep 2012 04:52:53 +0000 (21:52 -0700)
commit6bbfd13...2d2aa5b856fc7fb1616cb06c982fcb83
tree23d2a02...811abd8d1424d1ecfbd64a88b4716ae6copy hash to clipboard (tree)
parent728b7ad...bb6491d1d8bcd7498e06474b15812d52copy hash to clipboard (diff)
Documentation/git-p4.txt
git-p4.py
t/t9815-git-p4-submit-fail.sh