You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
cheat sheet: mark transplanted commits with prime (#2076)
Mark transplanted commits with prime, similar to how manpages
[git-rebase(1)](https://git-scm.com/docs/git-rebase) and
[git-cherry-pick(1)](https://git-scm.com/docs/git-cherry-pick) indicate
them.
## Changes
<!-- List the changes this PR makes. -->
- add a prime symbol (`′` `U+2032`) to letters representing commits
transplanted by
- `git rebase`
- `git merge --squash`
- `git cherry-pick`
## Context
<!-- Explain why you're making these changes. -->
Like in the manpages
[git-rebase(1)](https://git-scm.com/docs/git-rebase) and
[git-cherry-pick(1)](https://git-scm.com/docs/git-cherry-pick), we
should (also in the new cheat sheet) distinguish between a commit and
the commit resulting from transplanting it. They will usually represent
the same change, but they aren't the same commit and might (due to
different ancestors) not have the same file contents in the trees they
refer to (and also some metadata like commit date will differ in
general), thus they aren't the _same_ commit.
The manpages use the straight apostrophe (`'` a.k.a. "single quote") for
this, presumably to stay with ASCII-only for compatibility. I guess the
cheat sheet may dare to use the semantically more precise Unicode
character `PRIME` instead. For source encoding safety, I've used the
corresponding HTML entity.
If I should use the un-escaped Unicode character instead or even just
the ASCII straight apostrophe/single quote, please let me know.
0 commit comments