From: Jiang Xin <worldhello.net@gmail.com>
Date: Sat, 10 Aug 2019 12:11:17 +0000 (+0800)
Subject: Merge tag 'v2.23.0-rc2' of git://git.kernel.org/pub/scm/git/git
X-Git-Tag: v2.23.0~1^2~7
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d6d5cbfe87e2eb025ba316afe74b74d009cfd330

Merge tag 'v2.23.0-rc2' of git://git./git/git

Git 2.23-rc2

* tag 'v2.23.0-rc2' of git://git.kernel.org/pub/scm/git/git: (63 commits)
Git 2.23-rc2
t0000: reword comments for "local" test
t: decrease nesting in test_oid_to_path
sha1-file: release strbuf after use
test-dir-iterator: use path argument directly
dir-iterator: release strbuf after use
commit-graph: release strbufs after use
l10n: reformat some localized strings for v2.23.0
merge-recursive: avoid directory rename detection in recursive case
commit-graph: fix bug around octopus merges
restore: fix typo in docs
doc: typo: s/can not/cannot/ and s/is does/does/
Git 2.23-rc1
log: really flip the --mailmap default
RelNotes/2.23.0: fix a few typos and other minor issues
RelNotes/2.21.1: typofix
log: flip the --mailmap default unconditionally
config: work around bug with includeif:onbranch and early config
A few more last-minute fixes
repack: simplify handling of auto-bitmaps and .keep files
...
---

d6d5cbfe87e2eb025ba316afe74b74d009cfd330