From 1c9a32762b66706eb7ee3bcf3ee485a2bc3228b3 Mon Sep 17 00:00:00 2001 From: Seongmin Lee Date: Sun, 30 Nov 2025 12:02:41 +0900 Subject: [PATCH] vcs Signed-off-by: Seongmin Lee --- git/config | 3 --- git/ignore | 4 +++- jj/config.toml | 2 ++ 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/git/config b/git/config index 71f8e79..ab6e5c3 100644 --- a/git/config +++ b/git/config @@ -24,9 +24,6 @@ lg = log --branches --remotes --tags --graph --decorate ll = log --branches --remotes --tags --graph --decorate --oneline find = !sh -c 'git-repo-search \"$@\" | fzf | awk \"{print \\$NF}\" -- -[http "https://knot.tngl.boltless.dev/"] - sslCAInfo = /Users/boltless/repo/tangled/nix/vm-data/caddy/.local/share/caddy/pki/authorities/local/root.crt - ; sslCAPath = /Users/boltless/repo/tangled/nix/vm-data/caddy/.local/share/caddy/pki/authorities/local/ [filter "lfs"] smudge = git-lfs smudge -- %f process = git-lfs filter-process diff --git a/git/ignore b/git/ignore index 4e243c8..a5f1155 100644 --- a/git/ignore +++ b/git/ignore @@ -1,7 +1,9 @@ +# vim:ft=gitignore + .DS_Store note neorg.log /.opencode /.nvim.lua -# vim:ft=gitignore +**/.claude/settings.local.json diff --git a/jj/config.toml b/jj/config.toml index 89bc5fc..3e1e3d3 100644 --- a/jj/config.toml +++ b/jj/config.toml @@ -65,6 +65,8 @@ private-commits = "description(glob:'private:*') | description(glob:'local:*')" 'default()' = "@ | ancestors(immutable_heads().., 2) | trunk()" 'show(x)' = "@ | ancestors(..(x::) ~ immutable(), 2) | trunk()" 'mega_merge()' = "ancestors(..(MM::) ~ immutable(), 2)" +# 'immutable_heads()' = "heads(~mine())" +'immutable_heads()' = "builtin_immutable_heads() ~ mine()" [templates] draft_commit_description = ''' -- 2.51.2