diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-08-12 10:46:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-08-12 10:46:38 -0700 |
| commit | 556b57eb47f042408d3669a27a0a60a50a7de4a8 (patch) | |
| tree | 96a1342d92ac4a65164940f2eac8eff89ab39bec /git-config.html | |
| parent | b52664793b8af2208fdb1ec716b959e67c38ef7d (diff) | |
| download | git-htmldocs-556b57eb47f042408d3669a27a0a60a50a7de4a8.tar.gz | |
Autogenerated HTML docs for v2.23.0-rc2-8-gff669
Diffstat (limited to 'git-config.html')
| -rw-r--r-- | git-config.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-config.html b/git-config.html index 1e7ffe5bb..2441c88a3 100644 --- a/git-config.html +++ b/git-config.html @@ -3342,7 +3342,7 @@ color.blame.highlightRecent </p>
<div class="paragraph"><p>This setting should be set to a comma-separated list of color and date settings,
starting and ending with a color, the dates should be set from oldest to newest.
-The metadata will be colored given the colors if the the line was introduced
+The metadata will be colored given the colors if the line was introduced
before the given timestamp, overwriting older timestamped colors.</p></div>
<div class="paragraph"><p>Instead of an absolute timestamp relative timestamps work as well, e.g.
2.weeks.ago is valid to address anything older than 2 weeks.</p></div>
@@ -8632,7 +8632,7 @@ stash.useBuiltin the built-in rewrite of it in C.
</p>
<div class="paragraph"><p>The C rewrite is first included with Git version 2.22 (and Git for Windows
-version 2.19). This option serves an an escape hatch to re-enable the
+version 2.19). This option serves as an escape hatch to re-enable the
legacy version in case any bugs are found in the rewrite. This option and
the shell script version of <a href="git-stash.html">git-stash(1)</a> will be removed in some
future release.</p></div>
|