Use the undocumented -m and -p options to show the main commit ID.
Why are these not in the help!?
git show -m -p 25172c1
A piggy bank of commands, fixes, succinct reviews, some mini articles and technical opinions from a (mostly) Perl developer.