This will perform similarly to a cherry pick but lets you stage individual hunks git checkout -p