cheat sheet: Tweak the transplanted commit annotations#2078
Merged
To1ne merged 1 commit intogit:gh-pagesfrom Oct 1, 2025
Merged
cheat sheet: Tweak the transplanted commit annotations#2078To1ne merged 1 commit intogit:gh-pagesfrom
To1ne merged 1 commit intogit:gh-pagesfrom
Conversation
Collaborator
Collaborator
I prefer them being equally wide, even if it looks cramped (it's not that bad if you ask me) |
Member
Don't ask me, I am a mathematician originally, and my "best" time was when I worked on a theorem with four primes (i.e. a value that was derived from a value that was derived from a value that was derived from a value that was derived from the original value). 😁 |
Remove the "prime" from the stacked D and E because I think it's confusing. The idea of the D' annotation is that D is somehow a shorthand for a commit ID, and D' is meant to suggest that the transplanted commit has a different commit ID. But with the stacked D and E, the two D and E being grouped together are already doing the work to show that the new commit is modified in some way, so we don't need to add the "prime" (and it's not clear to me what the prime would mean)
Collaborator
Author
|
Okay, left the width as it is and adjusted this to just remove the prime. Also happy to close this if folks disagree :) |
Collaborator
|
Let's Merge and Revert If Necessary! |
Collaborator
LOL, so this is not true no more. Oh well, it's in the merge commit message anyway. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Made a couple of tweaks to #2076 that I think will make things clearer:
The idea of the "prime" annotation is that D is somehow a shorthand for a commit ID, and D' is meant to suggest that the transplanted commit has a different commit ID. I think this makes sense.
But with the stacked D and E, the two D and E being grouped together are already doing the work to show that the new commit is modified in some way, so we don't need to add the "prime" (and it's not clear to me what the prime could actually mean).