From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 14 Dec 2022 06:55:45 +0000 (+0900)
Subject: Merge branch 'kz/merge-tree-merge-base'
X-Git-Tag: v2.40.0-rc0~159
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7576e512cec7630ba2a35af33fa00868cedb8e18;p=thirdparty%2Fgit.git

Merge branch 'kz/merge-tree-merge-base'

"merge-tree" learns a new `--merge-base` option.

* kz/merge-tree-merge-base:
  docs: fix description of the `--merge-base` option
  merge-tree.c: allow specifying the merge-base when --stdin is passed
  merge-tree.c: add --merge-base=<commit> option
---

7576e512cec7630ba2a35af33fa00868cedb8e18