Merge branch 'bw/rebase-autostash-keep-current-branch'

diff --git a/Documentation/technical/api-trace2.txt b/Documentation/technical/api-trace2.txt
index fd1e6289447050c39dcc993c552196c24c21b6e9..71eb081fed25a7314a822087056a6c5b9a72d944 100644 (file)
--- a/Documentation/technical/api-trace2.txt
+++ b/Documentation/technical/api-trace2.txt
@@ -35,7 +35,7 @@ Format details are given in a later section.
 === 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.