From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 18 Sep 2012 21:36:17 +0000 (-0700)
Subject: Merge branch 'pw/p4-submit-conflicts'
X-Git-Tag: v1.8.0-rc0~36
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8db3865936550fe239b11a44ed52230c3c3eb223;p=thirdparty%2Fgit.git

Merge branch 'pw/p4-submit-conflicts'

Add '--conflict' option to git-p4 subcommand to specify what action
to take when conflicts are found during 'p4 submit'.

* pw/p4-submit-conflicts:
  git-p4: add submit --conflict option and config varaiable
  git p4: add submit --prepare-p4-only option
  git p4: add submit --dry-run option
  git p4: accept -v for --verbose
  git p4: revert deleted files after submit cancel
  git p4: rearrange submit template construction
  git p4: test clean-up after failed submit, fix added files
  git p4: standardize submit cancel due to unchanged template
  git p4: move conflict prompt into run, add [q]uit input
  git p4: remove submit failure options [a]pply and [w]rite
  git p4: gracefully fail if some commits could not be applied
  git p4 test: remove bash-ism of combined export/assignment
---

8db3865936550fe239b11a44ed52230c3c3eb223