From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 7 Mar 2024 23:59:41 +0000 (-0800)
Subject: Merge branch 'ml/log-merge-with-cherry-pick-and-other-pseudo-heads'
X-Git-Tag: v2.45.0-rc0~129
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6a887bdd9276acbcf359d86cc121fc4161293d13;p=thirdparty%2Fgit.git

Merge branch 'ml/log-merge-with-cherry-pick-and-other-pseudo-heads'

"git log --merge" learned to pay attention to CHERRY_PICK_HEAD and
other kinds of *_HEAD pseudorefs.

* ml/log-merge-with-cherry-pick-and-other-pseudo-heads:
  revision: implement `git log --merge` also for rebase/cherry-pick/revert
  revision: ensure MERGE_HEAD is a ref in prepare_show_merge
---

6a887bdd9276acbcf359d86cc121fc4161293d13