summaryrefslogtreecommitdiff
path: root/advice.h
diff options
context:
space:
mode:
authorMathieu Lienard--Mayor <Mathieu.Lienard--Mayor@ensimag.imag.fr>2013-06-12 08:06:44 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-06-12 23:59:55 (GMT)
commit7e30944622573ebdf87beed057b098af7360234c (patch)
treef955e84c0c9f38db34106ad261a6ceaff4153354 /advice.h
parent914dc0289d1df75cfa744cea8ec84cb529cbc791 (diff)
downloadgit-7e30944622573ebdf87beed057b098af7360234c.zip
git-7e30944622573ebdf87beed057b098af7360234c.tar.gz
git-7e30944622573ebdf87beed057b098af7360234c.tar.bz2
rm: introduce advice.rmHints to shorten messages
Introduce advice.rmHints to choose whether to display advice or not when git rm fails. Defaults to true, in order to preserve current behavior. As an example, the message: error: 'foo.txt' has changes staged in the index (use --cached to keep the file, or -f to force removal) would look like, with advice.rmHints=false: error: 'foo.txt' has changes staged in the index Signed-off-by: Mathieu Lienard--Mayor <Mathieu.Lienard--Mayor@ensimag.imag.fr> Signed-off-by: Jorge Juan Garcia Garcia <Jorge-Juan.Garcia-Garcia@ensimag.imag.fr> Signed-off-by: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 94caa32..36104c4 100644
--- a/advice.h
+++ b/advice.h
@@ -17,6 +17,7 @@ extern int advice_resolve_conflict;
extern int advice_implicit_identity;
extern int advice_detached_head;
extern int advice_set_upstream_failure;
+extern int advice_rm_hints;
int git_default_advice_config(const char *var, const char *value);
void advise(const char *advice, ...);