Julia Evans on Nostr: I'm still curious about whether there are other useful ways to view a git merge ...
I'm still curious about whether there are other useful ways to view a git merge commit other than `git show`, `git show -c`, and `git show --first-parent`
it feels tough because git show doesn't necessarily tell you what the merge did by itself, but looking at both full diffs from both parents feels like too much
Published at
2024-02-26 23:00:27Event JSON
{
"id": "fa3e963ef007acb4198cf6279e097800a935a956de1480a80e00fb9cd0dcd0bd",
"pubkey": "26cad6f140bf86de9c26b7c15419cab1aebdd7086358d26aa2d750e21cf3bf2e",
"created_at": 1708988427,
"kind": 1,
"tags": [
[
"e",
"06a057a3bf55210d17c878f25b84947631a1ffae0eaa9bb83730fa0c30b16a97",
"wss://relay.mostr.pub",
"reply"
],
[
"proxy",
"https://social.jvns.ca/users/b0rk/statuses/112000265561153122",
"activitypub"
]
],
"content": "I'm still curious about whether there are other useful ways to view a git merge commit other than `git show`, `git show -c`, and `git show --first-parent`\n\nit feels tough because git show doesn't necessarily tell you what the merge did by itself, but looking at both full diffs from both parents feels like too much",
"sig": "606d29aff7db4625a31a09f285fdd09c3474848e9a9c0bad650384772874548e506d4ec31c17f71ed68bd7c793b51057632c6d2904233b38c049aeeb95f0ffc2"
}
