summaryrefslogtreecommitdiff
path: root/Documentation/config
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-05-09 00:37:22 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-05-09 00:37:22 +0900
commita1985623415223662a51b240e814d5f22b231830 (patch)
tree5ab74e635e7094889373b984dd2a8ce3f5c7f023 /Documentation/config
parentMerge branch 'en/merge-directory-renames' (diff)
parenttag: advise on nested tags (diff)
downloadtgif-a1985623415223662a51b240e814d5f22b231830.tar.xz
Merge branch 'dl/warn-tagging-a-tag'
"git tag" learned to give an advice suggesting it might be a mistake when creating an annotated or signed tag that points at another tag. * dl/warn-tagging-a-tag: tag: advise on nested tags tag: fix formatting
Diffstat (limited to 'Documentation/config')
-rw-r--r--Documentation/config/advice.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/config/advice.txt b/Documentation/config/advice.txt
index 88620429ea..ec4f6ae658 100644
--- a/Documentation/config/advice.txt
+++ b/Documentation/config/advice.txt
@@ -90,4 +90,6 @@ advice.*::
waitingForEditor::
Print a message to the terminal whenever Git is waiting for
editor input from the user.
+ nestedTag::
+ Advice shown if a user attempts to recursively tag a tag object.
--