Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GitGraph: commit options for merge commits #3238

Closed
WeeBull opened this issue Jul 18, 2022 · 2 comments · Fixed by #3379
Closed

GitGraph: commit options for merge commits #3238

WeeBull opened this issue Jul 18, 2022 · 2 comments · Fixed by #3379
Assignees
Labels

Comments

@WeeBull
Copy link

WeeBull commented Jul 18, 2022

This is really a reopening of #2934 as the original request was for merge to support all fields that commit does, but the change only added support for tags.

Is your feature request related to a problem? Please describe.
Merge commits should be treated like ordinary commits, in that they should be customize-able with the same syntax. e.g.

commit tag: "vx.x.1" type: HIGHLIGHT id: "1"
merge develop tag: "vx.x.1" type: HIGHLIGHT id: "2"

Describe the solution you'd like
The syntax tree for merge should probably just be exactly the same as the commit tree after the branch name.

Additional context
Right now it is impossible to refer to a merge commit. The case I'm struggling with is cherry-picking a merge. Adding an extra commit afterwards isn't the same thing.

@WeeBull WeeBull added Status: Triage Needs to be verified, categorized, etc Type: Enhancement New feature or request labels Jul 18, 2022
@marijadjukic
Copy link

I was just writting a documentation with Git diagram and naturally added id option to a merge commit to be able to cherry-pick it and was disappointed when I realized it is not supported. Cherry-picking of merged requests is verry common in development so not being able to visualize it is a big gap. It would be really nice if this can be supported.

@amyq
Copy link
Contributor

amyq commented Aug 17, 2022

I can confirm the lack of the id: parameter on merge commits is a problem. The only option I've found so far is a hacky misuse of the tag: parameter to add words to a merge commit.

Similarly, some merge commits are squash merges, and there's no easy way to show the difference. That's why I'm (for now) abusing the tag: parameter to note that the merge commit is a squash merge.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging a pull request may close this issue.

4 participants