Git: Merging from Remote Branch « Ruby on Rails Outsourcing - 0 views
-
if the changes don't conflict, you're done. Alternatively, you can pick out individual commits from "repo1/stable" to your current branch by using git cherry-pick refnumber
-
Not a particularly useful post I admit, but this was the first time I was interested in merging in a single commit from a remote repo rather than an entire branch. The git command 'cherry-pick' does just that.
