Created
June 11, 2022 18:54
-
-
Save ThEMarD/018d706c6c3879097ba156331c8f9bfb to your computer and use it in GitHub Desktop.
Git subtree
This file contains hidden or 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
Initial merge: | |
git remote add qcacld-3.0 https://git.codelinaro.org/clo/la/platform/vendor/qcom-opensource/wlan/qcacld-3.0 | |
git fetch qcacld-3.0 <TAG> | |
git merge -s ours --no-commit --allow-unrelated-histories FETCH_HEAD | |
git read-tree --prefix=drivers/staging/qcacld-3.0 -u FETCH_HEAD | |
git commit | |
Updating to a newer tag: | |
git fetch qcacld-3.0 <TAG> | |
git merge -X subtree=drivers/staging/qcacld-3.0 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