From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 15 Mar 2024 23:05:59 +0000 (-0700)
Subject: Merge branch 'kh/branch-ref-syntax-advice'
X-Git-Tag: v2.45.0-rc0~107
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b09a8839a4a09ab5bea79bcfe892b2591097319a;p=thirdparty%2Fgit.git

Merge branch 'kh/branch-ref-syntax-advice'

When git refuses to create a branch because the proposed branch
name is not a valid refname, an advice message is given to refer
the user to exact naming rules.

* kh/branch-ref-syntax-advice:
  branch: advise about ref syntax rules
  advice: use double quotes for regular quoting
  advice: use backticks for verbatim
  advice: make all entries stylistically consistent
  t3200: improve test style
---

b09a8839a4a09ab5bea79bcfe892b2591097319a
diff --cc Documentation/config/advice.txt
index dde8e7840e,06c754899c..f833411653
--- a/Documentation/config/advice.txt
+++ b/Documentation/config/advice.txt
@@@ -123,23 -126,20 +126,23 @@@ advice.*:
  		by linkgit:git-switch[1] or
  		linkgit:git-checkout[1] when switching branches.
  	statusUoption::
- 		Advise to consider using the `-u` option to linkgit:git-status[1]
- 		when the command takes more than 2 seconds to enumerate untracked
- 		files.
+ 		Shown when linkgit:git-status[1] takes more than 2
+ 		seconds to enumerate untracked files, to tell the user that
+ 		they can use the `-u` option.
  	submoduleAlternateErrorStrategyDie::
- 		Advice shown when a submodule.alternateErrorStrategy option
+ 		Shown when a submodule.alternateErrorStrategy option
  		configured to "die" causes a fatal error.
 +	submoduleMergeConflict::
 +		Advice shown when a non-trivial submodule merge conflict is
 +		encountered.
  	submodulesNotUpdated::
- 		Advice shown when a user runs a submodule command that fails
+ 		Shown when a user runs a submodule command that fails
  		because `git submodule update --init` was not run.
  	suggestDetachingHead::
- 		Advice shown when linkgit:git-switch[1] refuses to detach HEAD
+ 		Shown when linkgit:git-switch[1] refuses to detach HEAD
  		without the explicit `--detach` option.
  	updateSparsePath::
- 		Advice shown when either linkgit:git-add[1] or linkgit:git-rm[1]
+ 		Shown when either linkgit:git-add[1] or linkgit:git-rm[1]
  		is asked to update index entries outside the current sparse
  		checkout.
  	waitingForEditor::