Changed wording on introduction to rebasing
Added cherry picking part