At 13:58 +0100 13 Dec 2012, Oliver Kiddle <okiddle@xxxxxxxxxxx> wrote:
+* Do not merge your private feature branches onto the master branch: a + linear history without merge commits is simpler to follow (and to + bisect). Both "git cherry-pick" and "git merge --ff-only" can be used + bring changes over to another branch without a merge commit.
The `--ff-only` option is only somewhat useful here. It merely causes the merge to be aborted if it can't be done without creating a merge commit, in which case some other method of bringing in those changes would need to be tried.