matteo/malcontent
1
0
Fork 0
Code Issues Pull requests 2 Projects Releases Packages Wiki Activity

WIP: add DNS parental controls (C++ version) #1

Draft
matteo wants to merge 2 commits from feature/dns-nss-parental-controls into main
pull from: feature/dns-nss-parental-controls
merge into: matteo:main
Conversation 0 Commits 2 Files changed 24 +1538 -1
matteo commented 2023-12-28 17:50:24 +01:00
Owner
Copy link
No description provided.
matteo force-pushed feature/dns-nss-parental-controls from d63171df77 to f5d5b3fd92 2023-12-28 19:58:01 +01:00 Compare
matteo force-pushed feature/dns-nss-parental-controls from f5d5b3fd92 to 4bae555d5e 2023-12-29 17:50:16 +01:00 Compare
matteo force-pushed feature/dns-nss-parental-controls from 4bae555d5e to 8b31eb0493 2023-12-29 19:30:45 +01:00 Compare
matteo force-pushed feature/dns-nss-parental-controls from 8b31eb0493 to 6f1f86b02a 2023-12-29 21:34:43 +01:00 Compare
matteo force-pushed feature/dns-nss-parental-controls from 6f1f86b02a to 16c5c52877 2023-12-30 13:03:02 +01:00 Compare
matteo force-pushed feature/dns-nss-parental-controls from 16c5c52877 to 5686774de1 2024-01-04 00:27:42 +01:00 Compare
matteo force-pushed feature/dns-nss-parental-controls from 5686774de1 to f8912b657e 2024-01-04 13:06:48 +01:00 Compare
matteo force-pushed feature/dns-nss-parental-controls from f8912b657e to c4a16b26ab 2024-01-04 13:16:35 +01:00 Compare
matteo force-pushed feature/dns-nss-parental-controls from c4a16b26ab to f2767a619c 2024-01-04 13:33:49 +01:00 Compare
matteo force-pushed feature/dns-nss-parental-controls from f2767a619c to 596b5f7f5a 2024-01-05 18:11:27 +01:00 Compare
matteo changed title from WIP: add DNS parental controls to WIP: add DNS parental controls (C++ version) 2024-01-05 18:13:16 +01:00
This pull request is marked as a work in progress.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin feature/dns-nss-parental-controls:feature/dns-nss-parental-controls
git switch feature/dns-nss-parental-controls

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main
git merge --no-ff feature/dns-nss-parental-controls
git switch feature/dns-nss-parental-controls
git rebase main
git switch main
git merge --ff-only feature/dns-nss-parental-controls
git switch feature/dns-nss-parental-controls
git rebase main
git switch main
git merge --no-ff feature/dns-nss-parental-controls
git switch main
git merge --squash feature/dns-nss-parental-controls
git switch main
git merge --ff-only feature/dns-nss-parental-controls
git switch main
git merge feature/dns-nss-parental-controls
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
matteo/malcontent!1
No description provided.