After organizing the 6th Marine Division from the brigade, Shepherd commanded it throughout the Battle of Okinawa where, for exceptionally meritorious service as commanding general of the 6th Marine Division in the assault and occupation of Okinawa (April 1 to June 21, 1945) he was awarded a Gold Star in lieu of a second Distinguished Service Medal. Subsequently, he took the division to Tsingtao, China. There, October 25, 1945, he received the surrender of the Japanese forces in this area for which he was awarded a second Legion of Merit.