summaryrefslogtreecommitdiff
path: root/advice.c
diff options
context:
space:
mode:
authorMatthieu Moy <Matthieu.Moy@imag.fr>2009-11-22 23:26:17 +0100
committerJunio C Hamano <gitster@pobox.com>2009-11-22 16:07:27 -0800
commit4c371f91270792791f867d15f25b03f800ab35a1 (patch)
tree8ca2bd7efa1e7801039ed90faeb13706d235b492 /advice.c
parent78d553b7d7b269bb22ebd8b1198657c37484a3a0 (diff)
downloadgit-4c371f91270792791f867d15f25b03f800ab35a1.tar.gz
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.c')
-rw-r--r--advice.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/advice.c b/advice.c
index ae4b1e81df..cb666acc3c 100644
--- a/advice.c
+++ b/advice.c
@@ -2,6 +2,7 @@
int advice_push_nonfastforward = 1;
int advice_status_hints = 1;
+int advice_commit_before_merge = 1;
static struct {
const char *name;
@@ -9,6 +10,7 @@ static struct {
} advice_config[] = {
{ "pushnonfastforward", &advice_push_nonfastforward },
{ "statushints", &advice_status_hints },
+ { "commitbeforemerge", &advice_commit_before_merge },
};
int git_default_advice_config(const char *var, const char *value)