Git Merge No Commit No Ff