diff options
| author | Pete Wyckoff <pw@padd.com> | 2012-09-09 16:16:13 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-16 21:52:53 -0700 |
| commit | 6bbfd1372d2aa5b856fc7fb1616cb06c982fcb83 (patch) | |
| tree | 23d2a025811abd8d1424d1ecfbd64a88b4716ae6 /lockfile.c | |
| parent | 728b7ad8bb6491d1d8bcd7498e06474b15812d52 (diff) | |
| download | git-6bbfd1372d2aa5b856fc7fb1616cb06c982fcb83.tar.gz git-6bbfd1372d2aa5b856fc7fb1616cb06c982fcb83.tar.xz | |
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>
Diffstat (limited to 'lockfile.c')
0 files changed, 0 insertions, 0 deletions