summaryrefslogtreecommitdiff
path: root/Documentation/merge-strategies.txt
diff options
context:
space:
mode:
authorLibravatar Ævar Arnfjörð Bjarmason <avarab@gmail.com>2017-07-01 13:15:47 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-07-01 10:47:05 -0700
commit3b702239d6399685aa69539b83be5f744cfa10e3 (patch)
tree4a2938057646a3f1f65ad9cd8c40ca575b6dbbff /Documentation/merge-strategies.txt
parentstrbuf.h comment: discuss strbuf_addftime() arguments in order (diff)
downloadtgif-3b702239d6399685aa69539b83be5f744cfa10e3.tar.xz
strbuf: change an always NULL/"" strbuf_addftime() param to bool
strbuf_addftime() allows callers to pass a time zone name for expanding %Z. The only current caller either passes the empty string or NULL, in which case %Z is handed over verbatim to strftime(3). Replace that string parameter with a flag controlling whether to remove %Z from the format specification. This simplifies the code. Commit-message-by: René Scharfe <l.s.r@web.de> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions