Oda Nobukatsu
The Komaki and Nagakute campaign proved indecisive and after months of fruitless marches and feints, Hideyoshi and Ieyasu settled the war through negotiation. First, Hideyoshi made peace with Oda Nobukatsu, and then he offered a truce to Ieyasu. The deal was made at the end of the year; as part of the terms Ieyasu's second son, Ogimaru (also known as Yuki Hideyasu) became an adopted son of Hideyoshi.