From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 20 Jan 2010 22:42:59 +0000 (-0800)
Subject: Merge branch 'mm/conflict-advice'
X-Git-Tag: v1.7.0-rc0~66
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=71b3ef11fa0aade4a514c51b83438858a4a3c03b;p=git.git

Merge branch 'mm/conflict-advice'

* mm/conflict-advice:
  Be more user-friendly when refusing to do something because of conflict.

Conflicts:
	Documentation/config.txt
	advice.c
	advice.h
---

71b3ef11fa0aade4a514c51b83438858a4a3c03b
diff --cc Documentation/config.txt
index d4332140a,9c27686fa..76c7d9c7e
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -130,10 -130,10 +130,14 @@@ advice.*:
  		Advice shown when linkgit:git-merge[1] refuses to
  		merge to avoid overwritting local changes.
  		Default: true.
+ 	resolveConflict::
+ 		Advices shown by various commands when conflicts
+ 		prevent the operation from being performed.
+ 		Default: true.
 +	implicitIdentity::
 +		Advice on how to set your identity configuration when
 +		your information is guessed from the system username and
 +		domain name. Default: true.
  --
  
  core.fileMode::
diff --cc advice.c
index 8f7de0e9e,3309521f4..936d98ba2
--- a/advice.c
+++ b/advice.c
@@@ -3,7 -3,7 +3,8 @@@
  int advice_push_nonfastforward = 1;
  int advice_status_hints = 1;
  int advice_commit_before_merge = 1;
+ int advice_resolve_conflict = 1;
 +int advice_implicit_identity = 1;
  
  static struct {
  	const char *name;
@@@ -12,7 -12,7 +13,8 @@@
  	{ "pushnonfastforward", &advice_push_nonfastforward },
  	{ "statushints", &advice_status_hints },
  	{ "commitbeforemerge", &advice_commit_before_merge },
+ 	{ "resolveconflict", &advice_resolve_conflict },
 +	{ "implicitidentity", &advice_implicit_identity },
  };
  
  int git_default_advice_config(const char *var, const char *value)
diff --cc advice.h
index 728ab90ef,acd5fdde3..9b7a3ad1c
--- a/advice.h
+++ b/advice.h
@@@ -4,7 -6,7 +6,8 @@@
  extern int advice_push_nonfastforward;
  extern int advice_status_hints;
  extern int advice_commit_before_merge;
+ extern int advice_resolve_conflict;
 +extern int advice_implicit_identity;
  
  int git_default_advice_config(const char *var, const char *value);