From: Taylor Blau <me@ttaylorr.com>
Date: Mon, 31 Oct 2022 01:04:44 +0000 (-0400)
Subject: Merge branch 'en/merge-tree-sequence'
X-Git-Tag: v2.39.0-rc0~52
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b1e3dd68ee5e078b04d26da78df81eeb601e0837;p=thirdparty%2Fgit.git

Merge branch 'en/merge-tree-sequence'

"git merge-tree --stdin" is a new way to request a series of merges
and report the merge results.

* en/merge-tree-sequence:
  merge-tree: support multiple batched merges with --stdin
  merge-tree: update documentation for differences in -z output
---

b1e3dd68ee5e078b04d26da78df81eeb601e0837