A simple bash script that automates the process of "hotfixing" or cherry-picking commits through branches. It creates unique branches so that you can merge only what need.

autopicker.sh

#!/usr/bin/env bash
autopick() {
  git fetch --all &&
  git checkout release &&
  git pull &&
  git submodule update &&
  git checkout -b hotfix/rel-$2 &&
  git cherry-pick $1 &&
  git push -u origin hotfix/rel-$2 &&
  git checkout master &&
  git pull &&
  git submodule update &&                                                                                                                                                           
  git checkout -b hotfix/mas-$2 &&
  git cherry-pick $1 &&
  git push -u origin hotfix/mas-$2
}

Add this script to your bash profile or wherever you keep bash scripts. autopick takes two arguments: 1) the desired commit hash & 2) a branch name. Once run, the script checks out fresh branches from release and master, cherry-picks the commit, and then pushes the new branches up so that they can be opened as pull requests.

Instructions:

1. Make sure you in the correct project directory (i.e. crds-net)
2. Run autopick <YOUR_COMMIT_HASH_HERE> <YOUR_BRANCH_NAME_HERE>
3. Two new branches will be created and pushed with cherry-picked commits
4. Open two PRs and request the appropriate reviewers
5. 💰 💵 🍾