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 /object.c | |
| parent | Merge branch 'eg/add-uflags' (diff) | |
| parent | revision: implement `git log --merge` also for rebase/cherry-pick/revert (diff) | |
| download | git-6a887bdd9276acbcf359d86cc121fc4161293d13.tar.gz git-6a887bdd9276acbcf359d86cc121fc4161293d13.zip | |
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 'object.c')
0 files changed, 0 insertions, 0 deletions