summaryrefslogtreecommitdiff
path: root/t/t3507-cherry-pick-conflict.sh
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2010-08-11 08:37:24 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-08-16 02:12:07 (GMT)
commit981ff5c37ae20687c98d98c8689d5e89016026d2 (patch)
tree868d1a043744c3eb2b744618038fc921fbcae1e5 /t/t3507-cherry-pick-conflict.sh
parent2a41dfb03b93c3e5b7d1deca537276aed063a044 (diff)
downloadgit-981ff5c37ae20687c98d98c8689d5e89016026d2.zip
git-981ff5c37ae20687c98d98c8689d5e89016026d2.tar.gz
git-981ff5c37ae20687c98d98c8689d5e89016026d2.tar.bz2
cherry-pick/revert: Use error() for failure message
When cherry-pick fails after picking a large series of commits, it can be hard to pick out the error message and advice. Clarify the error and prefix it with “error: ” to help. Before: Automatic cherry-pick failed. [...advice...] After: error: could not apply 7ab78c9... Do something neat. [...advice...] Noticed-by: Thomas Rast <trast@student.ethz.ch> Encouraged-by: Sverre Rabbelier <srabbelier@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3507-cherry-pick-conflict.sh')
0 files changed, 0 insertions, 0 deletions