Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
# AI
.claude/*
.aider.tags.cache.v4

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The pattern .aider.tags.cache.v4 is redundant because .aider* is already defined on line 78 of this file. Additionally, using a version-specific pattern like v4 is brittle; if you wish to keep this entry at the top for organization, consider a version-agnostic pattern like .aider.tags.cache.* to match the style used in the global gitignore.

.claude

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

Changing .claude/* to .claude will cause Git to ignore the entire directory. When a directory is ignored, Git does not process negation patterns (like !) for files inside that directory. To keep settings.json tracked while ignoring other files in .claude, you must use the .claude/* pattern.

.claude/*

!.claude/settings.json
.codex
.conductor
.crush
.cursor
.paperclip
.pi
.serena
.worktrees
prompts.db

Expand All @@ -12,6 +19,9 @@ config/ccs/accounts.json
.devenv.nix
objectstore

# JJ
.jj

# Nix
.devenv
*.hm-backup
Expand Down
2 changes: 1 addition & 1 deletion config/worktrunk/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ worktree-path = "{{ repo_path }}/.worktrees/{{ branch | sanitize }}"
copy = "wt step copy-ignored"

[step.copy-ignored]
exclude = [".cache/", ".devenv/", ".serena/"]
exclude = [".cache/", ".devenv/", ".serena/", ".paperclip/"]

[commit]
stage = "all"
Expand Down
4 changes: 4 additions & 0 deletions home-manager/programs/git/.gitignore.global
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
# AI
.aider.tags.cache.*/

Copilot AI Apr 5, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The global ignore uses a directory-only wildcard pattern (.aider.tags.cache.*/), while the repo .gitignore ignores a specific versioned entry (.aider.tags.cache.v4). This split is easy to drift and may miss future versions or file-vs-directory differences. Consider standardizing on a single pattern that covers all versions consistently across both files (e.g., a wildcard that matches versioned cache names regardless of whether they’re files or directories).

Suggested change
.aider.tags.cache.*/
.aider.tags.cache.*

Copilot uses AI. Check for mistakes.
.claude/

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

Adding .claude/ to the global gitignore can be problematic for repositories that intend to track specific configuration files within that directory (such as settings.json in this repository). While repo-level negations can override global ignores, they require explicitly un-ignoring the directory first. It is generally safer to keep tool-specific ignores that might contain shared configuration at the repository level.

Copilot AI Apr 5, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With .claude/ ignored globally, repositories that want to keep a whitelisted file like .claude/settings.json must also unignore the directory itself (e.g., !.claude/) in the repo ignore file; otherwise the nested unignore may not work. Given this PR also introduces a repo-level whitelist for .claude/settings.json, consider changing the global ignore to only ignore contents (e.g., .claude/*) or document/standardize the required !.claude/ + !.claude/settings.json pair in repo .gitignore.

Suggested change
.claude/
.claude/*

Copilot uses AI. Check for mistakes.
.conductor/
.crush/
.cursor/
.entire/
.paperclip/
.pi/
.serena/
.worktrees/
Expand Down
Loading