Git convention trivia: cherry-pick
Merge branch 'git-convention-trivia'