aboutsummaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorPete Wyckoff <pw@padd.com>2012-09-09 16:16:05 -0400
committerJunio C Hamano <gitster@pobox.com>2012-09-16 21:52:52 -0700
commit7e5dd9f2ccf2141d65e4621b765a136796b0d55b (patch)
treee36a8536c70bd82813385fb772261e6dbf524569 /.gitattributes
parent449bb9cf1a0c42ddf6e9b9b6fd447eda12f9bc92 (diff)
downloadgit-7e5dd9f2ccf2141d65e4621b765a136796b0d55b.tar.gz
git-7e5dd9f2ccf2141d65e4621b765a136796b0d55b.tar.xz
git p4: move conflict prompt into run, add [q]uit input
When applying a commit to the p4 workspace fails, a prompt asks what to do next. This belongs up in run() instead of in applyCommit(), where run() can notice, for instance, that the prompt is unnecessary because this is the last commit. Offer two options about how to continue at conflict: [s]kip or [q]uit. Having an explicit "quit" option gives git p4 a chance to clean up, show the applied-commit summary, and do tag export. 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 '.gitattributes')
0 files changed, 0 insertions, 0 deletions