kblin

# vim: set ft=ruby :
Vagrant.configure("2") do |config|
  config.vm.provision "shell", inline: "echo Hello"

  config.vm.define "controller" do |controller|
    controller.vm.box = "debian7"
    controller.vm.network "private_network", ip: "10.11.12.10"
    controller.vm.network "private_network", ip: "172.16.12.10"
  end

kblin

start: my_branch diverges from master at commit A, master HEAD is B

                -------X---Y--Z       my_branch
               /
--------------A-----------B           master

Now, you cherry-pick over Y, because it's a bug fix or the like..
(And some more patches)

                -------X---Y--Z       my_branch