Junio C Hamano  committed 3c06ab6 Merge

Merge branch 'jc/advice-doc' into maint

* jc/advice-doc:
advice: Document that they all default to true

  • Participants
  • Parent commits 770dd00, 26e94af
  • Branches master

Comments (0)

Files changed (1)

File Documentation/config.txt

 porcelain configuration variables in the respective porcelain documentation.
-	When set to 'true', display the given optional help message.
-	When set to 'false', do not display. The configuration variables
-	are:
+	These variables control various optional help messages designed to
+	aid new users. All 'advice.*' variables default to 'true', and you
+	can tell Git that you do not need help by setting these to 'false':
 		Advice shown when linkgit:git-push[1] refuses
-		non-fast-forward refs. Default: true.
+		non-fast-forward refs.
 		Directions on how to stage/unstage/add shown in the
 		output of linkgit:git-status[1] and the template shown
-		when writing commit messages. Default: true.
+		when writing commit messages.
 		Advice shown when linkgit:git-merge[1] refuses to
 		merge to avoid overwriting local changes.
-		Default: true.
 		Advices shown by various commands when conflicts
 		prevent the operation from being performed.
-		Default: true.
 		Advice on how to set your identity configuration when
 		your information is guessed from the system username and
-		domain name. Default: true.
+		domain name.
-		Advice shown when you used linkgit::git-checkout[1] to
+		Advice shown when you used linkgit:git-checkout[1] to
 		move to the detach HEAD state, to instruct how to create
-		a local branch after the fact.  Default: true.
+		a local branch after the fact.