[jeroen]

When it shows you a hunk that's bigger than you like, you can use 's' to split it into smaller hunks.

[johnisgood]

Thank you!

[harry_ord]

Cherrypick (-p) is wonderful. A command I also like is rebase interactive(-I)

Git rebase -i HEAD~[number of commits]