It might not hurt to add an example here. Those relatively new to git might get a bit lost in the terminology between cherry-pick, merge, and rebase.