cheat sheet: Tweak the transplanted commit annotations #2078
+4
−4
Conversation
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
Make the D' boxes a bit wider, so it doesn't look so cramped, and 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)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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).