Ease your vendor branch management worries with Piston, a tool to copy vendor / upstream code to your own repository, while preserving your local patches.
more
Use the unlock subcommand to enabled automatic updates of one or more pistonized directories.