termux-packages
termux-packages copied to clipboard
enhance(main/plutolang): rename to libpluto, use php scripts to build
Closes #21255
Also goes without saying, please squash your commits. Doesn't have to be an immediate thing, but do it before merge.
git rebase -i HEAD~7 you know the drill.
If you want to rebase your feature branch locally I recommend the following.
First of, in your local fork repo, add the upstream repo as a remote.
git remote add upstream https://github.com/termux/termux-packages.git
- Stash, commit, or make a diff of the pending changes on your feature branch so its "clean".
git stashorgit diff > branchname.diffshould do the trick
git switch masterFast-forward themasterbranch to upstream's state.git fetch --all -v; git rebase upstream/master- optionally
git pushto update the state of your fork as well.
- optionally
git switch <feature branch>git rebase masterto rebase it on top of the updatedmaster- if you have stashed changes or a diff, apply them (
git stash pop,git apply branchname.diff)
- if you have stashed changes or a diff, apply them (
git push --force-with-lease=branchname
Your feature branch is now up to date.