summaryrefslogtreecommitdiff
path: root/Documentation/config/advice.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2022-03-06 21:25:32 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2022-03-06 21:25:32 -0800
commit061fd5727ddafe6a751303587cf80ca2f956a273 (patch)
tree5e6da792816c234c69f3c07bcedd6ed937e2047c /Documentation/config/advice.txt
parentMerge branch 'ab/c99-designated-initializers' (diff)
parentswitch: mention the --detach option when dying due to lack of a branch (diff)
downloadtgif-061fd5727ddafe6a751303587cf80ca2f956a273.tar.xz
Merge branch 'ah/advice-switch-requires-detach-to-detach'
The error message given by "git switch HEAD~4" has been clarified to suggest the "--detach" option that is required. * ah/advice-switch-requires-detach-to-detach: switch: mention the --detach option when dying due to lack of a branch
Diffstat (limited to 'Documentation/config/advice.txt')
-rw-r--r--Documentation/config/advice.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/config/advice.txt b/Documentation/config/advice.txt
index adee26fbbb..c40eb09cb7 100644
--- a/Documentation/config/advice.txt
+++ b/Documentation/config/advice.txt
@@ -85,6 +85,9 @@ advice.*::
linkgit:git-switch[1] or linkgit:git-checkout[1]
to move to the detach HEAD state, to instruct how to
create a local branch after the fact.
+ suggestDetachingHead::
+ Advice shown when linkgit:git-switch[1] refuses to detach HEAD
+ without the explicit `--detach` option.
checkoutAmbiguousRemoteBranchName::
Advice shown when the argument to
linkgit:git-checkout[1] and linkgit:git-switch[1]