From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 19 Jul 2019 18:30:23 +0000 (-0700)
Subject: Merge branch 'js/trace2-signo-typofix'
X-Git-Tag: v2.23.0-rc0~26
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/fff813c6aee48348578f32c8ea5a48781f182b65?ds=inline;hp=-c

Merge branch 'js/trace2-signo-typofix'

Documentation fix.

* js/trace2-signo-typofix:
trace2: correct trace2 field name documentation
---

fff813c6aee48348578f32c8ea5a48781f182b65
diff --combined Documentation/technical/api-trace2.txt
index f7ffe7d599,fd1e628944..71eb081fed
--- a/Documentation/technical/api-trace2.txt
+++ b/Documentation/technical/api-trace2.txt
@@@ -35,7 -35,7 +35,7 @@@ Format details are given in a later sec
  === The Normal Format Target
  
  The normal format target is a tradition printf format and similar
 -to GIT_TRACE format.  This format is enabled with the `GIT_TR`
 +to GIT_TRACE format.  This format is enabled with the `GIT_TRACE2`
  environment variable or the `trace2.normalTarget` system or global
  config setting.
  
@@@ -668,7 -668,7 +668,7 @@@ completed.
  	"event":"signal",
  	...
  	"t_abs":0.001227,  # elapsed time in seconds
- 	"signal":13        # SIGTERM, SIGINT, etc.
+ 	"signo":13         # SIGTERM, SIGINT, etc.
  }
  ------------