Julia Evans on Nostr: trying to read git's source code to understand how `git revert` and `git cherry-pick` ...
trying to read git's source code to understand how `git revert` and `git cherry-pick` are implemented using merge and it's a bit confusing
https://github.com/git/git/blob/master/sequencer.c#L2353-L2358(has anyone ever seen an explanation of how "revert" is actually secretly a merge under the hood? i have some ideas but it would be nice to read about it somewhere other than git's source code)
Published at
2023-11-09 21:22:09Event JSON
{
"id": "dc769b35bfe778b6d4f0524efb5f3627a0ed9447009b5a2fab2ccd724a5f2926",
"pubkey": "26cad6f140bf86de9c26b7c15419cab1aebdd7086358d26aa2d750e21cf3bf2e",
"created_at": 1699564929,
"kind": 1,
"tags": [
[
"proxy",
"https://social.jvns.ca/users/b0rk/statuses/111382687223662474",
"activitypub"
]
],
"content": "trying to read git's source code to understand how `git revert` and `git cherry-pick` are implemented using merge and it's a bit confusing https://github.com/git/git/blob/master/sequencer.c#L2353-L2358\n\n(has anyone ever seen an explanation of how \"revert\" is actually secretly a merge under the hood? i have some ideas but it would be nice to read about it somewhere other than git's source code)",
"sig": "b45b6ce59fedfdc0c80d1d69a334345d5a88b79e6b47c04420a11219569288cfb661da57fcd78bed659e768191acc4131423a75de6b36ff5ec2bcc3d4753ed97"
}