aboutsummaryrefslogtreecommitdiff
path: root/advice.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-06-24 13:48:35 -0700
committerJunio C Hamano <gitster@pobox.com>2013-06-24 13:48:35 -0700
commit8d8975aca7c2b031a2386cd8f266109a8c6e1973 (patch)
tree478ec91418df2adce222d60abb14e935774713cb /advice.c
parent22d94a72b3c4fa7989c4827e84ebc364a200cd76 (diff)
parent7e30944622573ebdf87beed057b098af7360234c (diff)
downloadgit-8d8975aca7c2b031a2386cd8f266109a8c6e1973.tar.gz
git-8d8975aca7c2b031a2386cd8f266109a8c6e1973.tar.xz
Merge branch 'mm/rm-coalesce-errors'
Give a single message followed by list of paths from "git rm" to report multiple paths that cannot be removed. * mm/rm-coalesce-errors: rm: introduce advice.rmHints to shorten messages rm: better error message on failure for multiple files
Diffstat (limited to 'advice.c')
-rw-r--r--advice.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/advice.c b/advice.c
index 54315cbd0..2a52098a2 100644
--- a/advice.c
+++ b/advice.c
@@ -15,6 +15,7 @@ int advice_implicit_identity = 1;
int advice_detached_head = 1;
int advice_set_upstream_failure = 1;
int advice_object_name_warning = 1;
+int advice_rm_hints = 1;
static struct {
const char *name;
@@ -35,6 +36,7 @@ static struct {
{ "detachedhead", &advice_detached_head },
{ "setupstreamfailure", &advice_set_upstream_failure },
{ "object_name_warning", &advice_object_name_warning },
+ { "rmhints", &advice_rm_hints },
/* make this an alias for backward compatibility */
{ "pushnonfastforward", &advice_push_update_rejected }