emelie/nix-deploy
1
0
Fork 0
Code Issues 1 Pull requests 1 Projects Releases Wiki Activity

WIP: Add grocy #2

Draft
emelie wants to merge 1 commit from grocy into main
pull from: grocy
merge into: emelie:main
Conversation 0 Commits 1 Files changed 2 +11
emelie commented 2022-04-12 16:34:14 +02:00
Owner
Copy link

Add grocy configuration. This requires some changes to the systemd service configuration, see Johan's messages in the nix aalborg chat.

Add grocy configuration. This requires some changes to the systemd service configuration, see Johan's messages in the nix aalborg chat.
emelie added 1 commit 2022-04-12 16:34:15 +02:00
emelie changed title from Add incomplete grocy configuration to Add grocy 2022-04-12 16:34:27 +02:00
emelie changed title from Add grocy to WIP: Add grocy 2022-04-12 16:36:29 +02:00
This pull request is marked as a work in progress.
This branch is out-of-date with the base branch
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin grocy:grocy
git checkout grocy

Merge

Merge the changes and update on Forgejo.
git checkout main
git merge --no-ff grocy
git checkout main
git merge --ff-only grocy
git checkout grocy
git rebase main
git checkout main
git merge --no-ff grocy
git checkout main
git merge --squash grocy
git checkout main
git merge --ff-only grocy
git checkout main
git merge grocy
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: emelie/nix-deploy#2
No description provided.
Delete branch "grocy"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?