Created
January 20, 2017 10:55
-
-
Save euank/150aac8eb9bdd3b3397b56960d3ac8f1 to your computer and use it in GitHub Desktop.
Moving subtrees, but the modern way
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
$ git clone https://github.com/kubernetes/kubernetes && cd kubernetes | |
$ git remote add rktlet https://github.com/kubernetes-incubator/rktlet | |
$ git fetch rktlet | |
$ git checkout rktlet/master | |
$ git subtree split -P rktlet -b rktlet-subtree | |
# note -P rktlet is the subdir 'rktlet' and -b is the arbitrary branch name | |
$ git checkout master # kubernetes | |
$ rm -rf ./pkg/kubelet/rktshim/ && git commit -avm "rktshim: delete old code" | |
$ git subtree add -P pkg/kubelet/rktshim rktlet-subtree | |
$ # Done |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment