Lazygit is incredibly capable for everything (including this). I don't touch the git cli anymore.