summaryrefslogtreecommitdiff
path: root/Documentation/config
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-02-14 12:54:19 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-02-14 12:54:19 -0800
commitdaef1b300b07c3d17d47c3bf01ebde28b62ff3fe (patch)
tree3907573bbdd40095398e9cd159d3e971d4233a18 /Documentation/config
parentThe fourth batch for 2.26 (diff)
parentadd: change advice config variables used by the add API (diff)
downloadtgif-daef1b300b07c3d17d47c3bf01ebde28b62ff3fe.tar.xz
Merge branch 'hw/advice-add-nothing'
Two help messages given when "git add" notices the user gave it nothing to add have been updated to use advise() API. * hw/advice-add-nothing: add: change advice config variables used by the add API add: use advise function to display hints
Diffstat (limited to 'Documentation/config')
-rw-r--r--Documentation/config/advice.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/config/advice.txt b/Documentation/config/advice.txt
index 4be93f8ad9..bdd37c3eaa 100644
--- a/Documentation/config/advice.txt
+++ b/Documentation/config/advice.txt
@@ -110,4 +110,10 @@ advice.*::
submoduleAlternateErrorStrategyDie::
Advice shown when a submodule.alternateErrorStrategy option
configured to "die" causes a fatal error.
+ addIgnoredFile::
+ Advice shown if a user attempts to add an ignored file to
+ the index.
+ addEmptyPathspec::
+ Advice shown if a user runs the add command without providing
+ the pathspec parameter.
--