Skip to content

Instantly share code, notes, and snippets.

@ThEMarD
Created December 16, 2022 07:25
Show Gist options
  • Save ThEMarD/8bb1abde0414d2d6eff272af25ead024 to your computer and use it in GitHub Desktop.
Save ThEMarD/8bb1abde0414d2d6eff272af25ead024 to your computer and use it in GitHub Desktop.
git subtree fw-api
Initial merge:
git remote add fw-api https://git.codelinaro.org/clo/la/platform/vendor/qcom-opensource/wlan/fw-api.git
Old:
https://source.codeaurora.org/quic/la/platform/vendor/qcom-opensource/wlan/fw-api
git fetch fw-api <TAG>
git merge -s ours --no-commit --allow-unrelated-histories FETCH_HEAD
git read-tree --prefix=drivers/staging/fw-api -u FETCH_HEAD
git commit
Updating to a newer tag:
git fetch fw-api <TAG>
git merge -X subtree=drivers/staging/fw-api FETCH_HEAD
to bypass gerrit push
HEAD:refs/heads/lineage-
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment