]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d32dd8a ec1edbc)
Merge branch 'en/merge-tree-sequence'
authorTaylor Blau <me@ttaylorr.com>
Mon, 31 Oct 2022 01:04:44 +0000 (21:04 -0400)
committerTaylor Blau <me@ttaylorr.com>
Mon, 31 Oct 2022 01:04:44 +0000 (21:04 -0400)
"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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.