diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-03-07 15:59:41 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-03-07 15:59:41 -0800 |
| commit | 6a887bdd9276acbcf359d86cc121fc4161293d13 (patch) | |
| tree | 91db6aa66e8edec70cebe7d2a4946181d5869a60 /builtin/commit.c | |
| parent | f46a3f143eba661b9eb2b1e741447d6709eb6e90 (diff) | |
| parent | f3fc5d9c912df0e07c43a79f289220434f72b617 (diff) | |
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
Diffstat (limited to 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions