git-cherry-pick-merge-commit

#!/usr/bin/env bash

_usage () {
  echo Cherry pick merge commits >&2
  exit 1
}

_error () {
  echo "$@" >&2
  exit 1
}
  
getCommitMessage () {
  git log -1 $1 --format="%B"
}
getCommitAuthor () {
  git log -1 $1 --format="%an"
}
getCommitTimestamp () {
  git log -1 $1 --format="%ad"
}
getMergedHeads () {
  git show $1 | grep ^Merge -m1 | cut -d: -f2- | xargs -n1 
}

findMergePoint () {
  local merges=$(getMergedHeads $@)
  for i in $merges
  do
    git log -1 $i --format="%h %s %an" >&2
  done
  select mergePoint in $merges "Cancel"; do
    case $mergePoint in
      Cancel ) _error "Aborted";;
      * ) break;;
    esac
  done
}

main () {
  findMergePoint $@

  git merge $mergePoint -m "$(getCommitMessage $@)" &&
  git commit \
    --author "$(getCommitAuthor $@)" \
    -m "$(getCommitMessage $@)" \
    --date "$(getCommitTimestamp $@)" \
    --amend
}


case $1 in
  '') _usage ;;
  *) main $@ ;;
esac