Re: [PATCH v3 2/2] revision: Implement `git log --merge` also for rebase/cherry_pick/revert
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jan 24, 2024, 19:46 UTC
- Message-ID
- <xmqq1qa6ecqr.fsf@gitster.g>
- In-Reply-To
- <dfb582cf-b1e4-414d-bfe1-0f93d910ec54@kdbg.org>
Johannes Sixt <j6t@kdbg.org> writes:
Show 8 quoted lines
> Good point! IMO, REBASE_HEAD should have lower precedence than all the
> other *_HEADs. It would mean to reorder the entries:
>
> static const char *const other_head[] = {
> "MERGE_HEAD", "CHERRY_PICK_HEAD", "REVERT_HEAD", "REBASE_HEAD"
> };
>
> (and perhaps adjust the error message, too).And probably give a warning saying that we noticed you are rebasing and cherry-picking and we chose to show the --merge based on the relationship between cherry-pick-head and head, ignoring your rebase status, or something.