Page Comparison

...

<external_name> is a name you give to the external so that you can refer to the external repository. Note that <external_name> can be a branch name, a commit, or a tag name.

<external_url> is the URL for the external repository.

<external_commit> refers to a branch name (<external_url>/<branch_name>), a commit, or a tag name from the external repository.

<external_branchname> refers to local branch created with git subtree split. In preparation for merging with an upstream repository.

...

Insert new external subtree into ACME (one-time setup)

...

1. Create and switch to a branch in which to conduct the work. Be sure to follow the branch naming conventions and other development practices. The branch name should follow the form github-username/component/component.<version>-import.
2. Add external git repo to as a remote in your local repository copy (git remote add -f --tags <external_name> <external_url>).
3. Merge  from external git repo to ACME (git merge --squash -X subtree=<external_subdir> --no-commit <external_commit>).
4. Commit the change (git commit).
5. Test and submit a pull request as defined in the development practices page.

...

Split changes from an ACME subtree for merging with an external repo

Note that <external_name> can be a branch name, a commit, or a tag nameThis workflow is to be used any time changes to an ACME subtree should be shared with the source external repository. For example, consider a bug fix made in the ACME MCT code. This workflow would allow contributing that fix upstream to MCT. Note that this workflow should not be used for the case where the ACME subdirectory was not brought into ACME as a subtree. That workflow is beyond the scope of this document.

1. Pull changes from the ACME subtree into a new branch (git subtree split -P <external_subdir> -b <external_branchname>).

Related articles

...