summaryrefslogtreecommitdiff
path: root/advice.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-06-24 20:48:35 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-06-24 20:48:35 (GMT)
commit8d8975aca7c2b031a2386cd8f266109a8c6e1973 (patch)
tree478ec91418df2adce222d60abb14e935774713cb /advice.h
parent22d94a72b3c4fa7989c4827e84ebc364a200cd76 (diff)
parent7e30944622573ebdf87beed057b098af7360234c (diff)
downloadgit-8d8975aca7c2b031a2386cd8f266109a8c6e1973.zip
git-8d8975aca7c2b031a2386cd8f266109a8c6e1973.tar.gz
git-8d8975aca7c2b031a2386cd8f266109a8c6e1973.tar.bz2
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.h')
-rw-r--r--advice.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/advice.h b/advice.h
index fefe39a..93a7d11 100644
--- a/advice.h
+++ b/advice.h
@@ -18,6 +18,7 @@ extern int advice_implicit_identity;
extern int advice_detached_head;
extern int advice_set_upstream_failure;
extern int advice_object_name_warning;
+extern int advice_rm_hints;
int git_default_advice_config(const char *var, const char *value);
void advise(const char *advice, ...);