the-distro/infra
9
0
Fork 5
Code Issues 37 Pull requests 7 Packages Projects 1 Releases Wiki Activity

treewide: add pre-commit nixfmt hook, reformat everything #96

Open
k900 wants to merge 3 commits from format into main
pull from: format
merge into: the-distro:main
Conversation 0 Commits 3 Files changed 48 +1320 -823
k900 commented 2024-08-09 15:41:48 +00:00
Owner
Copy link

Do we want this? idk

I like some bits a lot and dislike some bits a lot but consistency is also good

Bring on the bikeshed

Do we want this? idk I like some bits a lot and dislike some bits a lot but consistency is also good Bring on the bikeshed
k900 added 1 commit 2024-08-09 15:41:52 +00:00
k900 force-pushed format from b8e196a385 to 514d43fd42 2024-08-09 15:47:22 +00:00 Compare
This pull request has changes conflicting with the target branch.
  • common/admins.nix
  • common/base-server.nix
  • common/raito-proxy-aware-nginx.nix
  • common/raito-vm.nix
  • common/ssh-keys.nix
  • common/sysadmin/default.nix
  • flake.lock
  • flake.nix
  • hosts/gerrit01/default.nix
  • overlays/default.nix
View command line instructions

Checkout

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

Merge

Merge the changes and update on Forgejo.
git checkout main
git merge --no-ff format
git checkout main
git merge --ff-only format
git checkout format
git rebase main
git checkout main
git merge --no-ff format
git checkout main
git merge --squash format
git checkout main
git merge --ff-only format
git checkout main
git merge format
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: the-distro/infra#96
No description provided.
Delete branch "format"

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?