Cherry-Picking Commits Across Git Repositories: Fetching and Applying Specific Commits from Remote Repos

Fundamental Principles of Git Cherry-Picking

Git's cherry-pick command enables developers to select specific commits and apply their changes to the current branch. Unlike merge operations, cherry-picking only replicates the change content of commits without introducing entire branch histories. This precise change introduction method becomes particularly important when needing to obtain specific feature fixes or improvements from another completely independent Git repository.

Implementation Steps for Cross-Repository Cherry-Picking

To cherry-pick commits from another Git repository, you first need to establish connections between repositories. Adding remote repositories provides access to external commit histories:

git remote add other https://example.link/repository.git
git fetch other

In the above commands, git remote add adds the target repository as a remote reference named "other", while git fetch retrieves all branches and commit information from that repository. At this point, the external repository's commit history becomes visible to the local repository.

Commit Identification and Cherry-Pick Execution

After fetching remote repository data, you need to locate the target commit. Use git log other/main --oneline to view the commit history of remote branches, where "other/main" represents the main branch of the remote repository. Once you find the hash value of the target commit, execute the cherry-pick operation:

git cherry-pick <commit-hash>

Git automatically applies the changes from that commit to the current branch and creates a new commit record. If conflicts occur during cherry-picking, Git pauses the operation and prompts the developer for manual resolution.

Conflict Handling and Process Control

When cherry-picked commits have code conflicts with the current branch, you need to execute the conflict resolution process:

# Mark files as resolved after conflict resolution
git add <resolved-files>
# Continue the cherry-pick process
git cherry-pick --continue

If you decide to abandon the cherry-pick operation, use the git cherry-pick --abort command to revert to the pre-operation state.

Temporary Remote Repository Management

For one-time cherry-picking needs, it's recommended to remove temporarily added remote repositories after operation completion:

git remote remove other

This approach helps maintain clean repository configurations and avoids unnecessary accumulation of remote references.

Special Considerations in git-svn Environments

In workflows using git-svn, cross-repository cherry-picking remains applicable. For example, when cherry-picking commits from a Git repository corresponding to a Subversion branch to the main repository, the aforementioned methods work effectively. It's important to note that repositories managed by git-svn may have specific commit history structures, but the core logic of cherry-picking operations remains unchanged.

Alternative Approach Comparison

Besides the remote repository method, you can also use the combination of git format-patch and git am:

git --git-dir=../<some_other_repo>/.git format-patch -k -1 --stdout <commit SHA> | git am -3 -k

This method achieves cross-repository change transfer by generating patch files and applying them, suitable for scenarios involving direct filesystem-level access to other repositories. The -3 parameter enables three-way merging, improving conflict resolution success rates.

Best Practice Recommendations

When performing cross-repository cherry-picking, it's recommended to follow these practices: ensure clear context for target commits, verify change compatibility, conduct preliminary validation in testing environments, and maintain detailed change records. These measures can reduce integration risks and improve development efficiency.