Skip to content

Comments

Convert libglnx to subtree#692

Merged
bbhtt merged 3 commits intomainfrom
bbhtt/libglnx-subtree-2
Feb 22, 2026
Merged

Convert libglnx to subtree#692
bbhtt merged 3 commits intomainfrom
bbhtt/libglnx-subtree-2

Conversation

@bbhtt
Copy link
Contributor

@bbhtt bbhtt commented Oct 21, 2025

No description provided.

@bbhtt
Copy link
Contributor Author

bbhtt commented Oct 21, 2025

This is at same commit added with:

git subtree add --prefix=subprojects/libglnx libglnx 202b294e6079e23242e65e0426f8639841d1210b --squash

Updating looks like this:

git subtree pull --prefix=subprojects/libglnx libglnx master --squash
image

@bbhtt bbhtt mentioned this pull request Oct 21, 2025
The NEWS fragment is added here as the next two commits will be
created by git-subtree
git-subtree-dir: subprojects/libglnx
git-subtree-split: 202b294
@bbhtt bbhtt force-pushed the bbhtt/libglnx-subtree-2 branch from 5bea5ce to 7ba88e0 Compare February 22, 2026 04:27
@bbhtt bbhtt changed the title Subtree 2 Convert libglnx to subtree Feb 22, 2026
@bbhtt bbhtt merged commit a38eb17 into main Feb 22, 2026
5 checks passed
@bbhtt bbhtt deleted the bbhtt/libglnx-subtree-2 branch February 22, 2026 04:34
@bbhtt
Copy link
Contributor Author

bbhtt commented Feb 22, 2026

Merged manually through git, GitHub doesn't allow to merge this.

git checkout main
rm -rf subprojects/libglnx
git merge --no-ff bbhtt/libglnx-subtree-2
git push

@bbhtt bbhtt added this to the 1.5.0 milestone Feb 22, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant