summaryrefslogtreecommitdiff
path: root/advice.h
diff options
context:
space:
mode:
authorMatthieu Moy <Matthieu.Moy@imag.fr>2009-11-22 22:26:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-11-23 00:07:27 (GMT)
commit4c371f91270792791f867d15f25b03f800ab35a1 (patch)
tree8ca2bd7efa1e7801039ed90faeb13706d235b492 /advice.h
parent78d553b7d7b269bb22ebd8b1198657c37484a3a0 (diff)
downloadgit-4c371f91270792791f867d15f25b03f800ab35a1.zip
git-4c371f91270792791f867d15f25b03f800ab35a1.tar.gz
git-4c371f91270792791f867d15f25b03f800ab35a1.tar.bz2
merge-recursive: point the user to commit when file would be overwritten.
The commit-before-pull is well accepted in the DVCS community, but is confusing some new users. This should get them back in the right way when the problem occurs. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.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 e9df8e0..3de5000 100644
--- a/advice.h
+++ b/advice.h
@@ -3,6 +3,7 @@
extern int advice_push_nonfastforward;
extern int advice_status_hints;
+extern int advice_commit_before_merge;
int git_default_advice_config(const char *var, const char *value);