]> git.ipfire.org Git - thirdparty/git.git/commit - git-p4.py
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 728b7ad) | patch
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)
commit6bbfd1372d2aa5b856fc7fb1616cb06c982fcb83
tree23d2a025811abd8d1424d1ecfbd64a88b4716ae6tree | snapshot
parent728b7ad8bb6491d1d8bcd7498e06474b15812d52commit | diff
git-p4: add submit --conflict option and config varaiable

This allows specifying what to do when a conflict
happens when applying a commit to p4, automating the
interactive prompt.

Signed-off-by: Pete Wyckoff <pw@padd.com>
Acked-by: Luke Diamand <luke@diamand.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-p4.txt diff | blob | blame | history
git-p4.py diff | blob | blame | history
t/t9815-git-p4-submit-fail.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.