nki/nix-home
1
0
Fork 0
Code Issues Pull requests 2 Packages Projects Releases Wiki Activity

Move kakoune to a full-fledged package #4

Open
nki wants to merge 39 commits from kakoune-package into master
pull from: kakoune-package
merge into: nki:master
Conversation 0 Commits 39 Files changed 35 +1028 -1075
nki commented 2024-10-07 20:34:57 +00:00
Owner
Copy link

Will allow cloud deployments to access the fully customized kakoune package.
Includes kakoune-lsp, but not tree-sitter: tree-sitter requires a configuration file at ~/.config

Will allow cloud deployments to access the fully customized kakoune package. Includes `kakoune-lsp`, but not tree-sitter: tree-sitter requires a configuration file at ~/.config
nki added 9 commits 2024-10-07 20:34:59 +00:00
nki added 1 commit 2024-10-19 16:39:50 +00:00
nki added 2 commits 2024-11-04 13:49:03 +00:00
nki force-pushed kakoune-package from 050dd8660e to 1f7294581f 2024-11-18 14:33:11 +00:00 Compare
nki added 1 commit 2024-11-29 13:48:18 +00:00
nki force-pushed kakoune-package from 251fc88b64 to cb800c9fa4 2025-01-04 13:55:23 +00:00 Compare
nki added 2 commits 2025-01-17 10:58:03 +00:00 
https://github.blog/open-source/git/highlights-from-git-2-35/
https://git-scm.com/docs/git-config#Documentation/git-config.txt-mergeconflictStyle
nki force-pushed kakoune-package from 385ba7cce7 to 331e17df53 2025-01-17 11:07:33 +00:00 Compare
nki added 2 commits 2025-01-17 14:54:17 +00:00
nki added 1 commit 2025-01-17 15:19:03 +00:00
nki added 2 commits 2025-01-19 21:21:25 +00:00
nki added 1 commit 2025-01-21 16:16:08 +00:00
nki added 2 commits 2025-01-21 21:16:37 +00:00
nki force-pushed kakoune-package from 5da2417f69 to 357866e46b 2025-01-21 22:06:38 +00:00 Compare
nki added 1 commit 2025-01-22 23:07:56 +00:00
nki added 1 commit 2025-02-03 13:53:21 +00:00
nki added 1 commit 2025-02-03 14:41:19 +00:00
nki added 1 commit 2025-02-03 14:41:45 +00:00
nki added 2 commits 2025-02-15 12:46:32 +00:00
nki added 2 commits 2025-02-15 12:47:13 +00:00
nki added 5 commits 2025-02-21 01:43:33 +00:00
nki added 1 commit 2025-02-21 11:57:52 +00:00
This pull request has changes conflicting with the target branch.
  • flake.lock
View command line instructions

Checkout

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

Merge

Merge the changes and update on Forgejo.
git checkout master
git merge --no-ff kakoune-package
git checkout master
git merge --ff-only kakoune-package
git checkout kakoune-package
git rebase master
git checkout master
git merge --no-ff kakoune-package
git checkout master
git merge --squash kakoune-package
git checkout master
git merge --ff-only kakoune-package
git checkout master
git merge kakoune-package
git push origin master
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: nki/nix-home#4
No description provided.
Delete branch "kakoune-package"

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?