aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/technical
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-12-08 15:11:17 -0800
committerJunio C Hamano <gitster@pobox.com>2020-12-08 15:11:17 -0800
commit2aeafbc8967078b5b3804e03d48cc4d22fa045ca (patch)
tree4f7960f93be5ba54f0f6fb868afb850510748724 /Documentation/technical
parent3a0b884caba2752da0af626fb2de7d597c844e8b (diff)
parent0ee10fd12968b78dbd1ccbba108599a24f31f70b (diff)
downloadgit-2aeafbc8967078b5b3804e03d48cc4d22fa045ca.tar.gz
Merge branch 'jt/trace-error-on-warning'
Like die() and error(), a call to warning() will also trigger a trace2 event. * jt/trace-error-on-warning: usage: add trace2 entry upon warning()
Diffstat (limited to 'Documentation/technical')
-rw-r--r--Documentation/technical/api-trace2.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/technical/api-trace2.txt b/Documentation/technical/api-trace2.txt
index 6b6085585d..c65ffafc48 100644
--- a/Documentation/technical/api-trace2.txt
+++ b/Documentation/technical/api-trace2.txt
@@ -466,7 +466,7 @@ completed.)
`"error"`::
This event is emitted when one of the `error()`, `die()`,
- or `usage()` functions are called.
+ `warning()`, or `usage()` functions are called.
+
------------
{