Code

Merge branch 'jh/notes-merge-in-git-dir-worktree'