mirrors/jj
1
0
Fork 0
mirror of https://github.com/jj-vcs/jj.git synced 2025-12-23 06:01:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

colocation: rename from "colocated repo" to "colocated workspace"

Browse source 
Colocation is about sharing the working copy between jj and git. It's
less important where the repo is stored. I therefore think we should
not call it "colocated repo". I considered renaming it to "colocated
working copy" but that sounded awkward in many places because we often
talk about the whole workspace (repo + working copy), so "In colocated
workspaces with a very large number of branches or other refs" sounds
better than "In colocated working copies with a very large number of
branches or other refs".

Once we support colocate workspaces in non-main Git worktrees, I think
this rename will be even more relevant because then all those
workspaces share the same repo but only some of them may be colocated.
This commit is contained in:
Martin von Zweigbergk 2025-10-30 13:42:59 -07:00
parent 3899e178a0
commit b409aa3189
27 changed files with 117 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

6
docs/github.md
View file

@ -57,14 +57,14 @@ changes.
[sync-issue]: https://github.com/jj-vcs/jj/issues/1039
## Working in a Git colocated repository
## Working in a Git colocated workspaces
After doing `jj git init`, which
[colocates](git-compatibility.md#colocated-jujutsugit-repos) the `.jj` and
`.git` directories, Git will be in a [detached HEAD state][detached], which is
unusual, as Git mainly works with named branches; jj does not.
In a colocated repository, every `jj` command will automatically synchronize
In a colocated workspace, every `jj` command will automatically synchronize
Jujutsu's view of the repo with Git's view. For example, `jj commit` updates the
HEAD of the Git repository, enabling an incremental migration.
@ -191,7 +191,7 @@ export GIT_DIR=$PWD/.jj/repo/store/git
```
and run `direnv allow` to approve it for direnv to run. Then GitHub CLI will
work automatically even in repos that aren't colocated so you can execute
work automatically even in workspaces that aren't colocated so you can execute
commands like `gh issue list` normally.
[issue #1008]: https://github.com/jj-vcs/jj/issues/1008