Merge changes Ib8bdaa14,I62380485,I6cbedbd2

* changes:
  repo-pull: Add `--pick` for non-merge commits
  repo-pull: Allow to ignore local branch name
  repo-pull: Add checkout for merge commits