Flummoxed by IT: Git: Merge selected commits from upstream repository