From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 10 Dec 2021 22:35:07 +0000 (-0800)
Subject: Merge branch 'jk/strbuf-addftime-seconds-since-epoch'
X-Git-Tag: v2.35.0-rc0~118
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1c39c822a9a57efc811793ca0ffe9d872eabc12c;p=thirdparty%2Fgit.git

Merge branch 'jk/strbuf-addftime-seconds-since-epoch'

The "--date=format:<strftime>" gained a workaround for the lack of
system support for a non-local timezone to handle "%s" placeholder.

* jk/strbuf-addftime-seconds-since-epoch:
  strbuf_addftime(): handle "%s" manually
---

1c39c822a9a57efc811793ca0ffe9d872eabc12c