Experiments in rebasing and merging with git