Skip to content

Commit

Permalink
docs: Update readme/changelog for jj git colocate
Browse files Browse the repository at this point in the history
  • Loading branch information
cormacrelf committed Nov 11, 2024
1 parent e349cce commit 6091659
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 16 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
[documentation](https://martinvonz.github.io/jj/latest/install-and-setup/#command-line-completion)
to activate them.

* New command `jj git colocate` that turns a non-colocated repo into a
colocated one.

### Fixed bugs

## [0.23.0] - 2024-11-06
Expand Down
19 changes: 3 additions & 16 deletions docs/git-compatibility.md
Original file line number Diff line number Diff line change
Expand Up @@ -164,27 +164,14 @@ repos may require you to deal with more involved Jujutsu and Git concepts.
report any new ones you find, or if any of the known bugs are less minor than
they appear.

### Converting a repo into a co-located repo
### Converting a repo into a colocated repo

A Jujutsu repo backed by a Git repo has a full Git repo inside, so it is
technically possible (though not officially supported) to convert it into a
co-located repo like so:
You can convert a non-colocated repo into a colocated repo like so:

```bash
# Move the Git repo
mv .jj/repo/store/git .git
# Tell jj where to find it
echo -n '../../../.git' > .jj/repo/store/git_target
# Ignore the .jj directory in Git
echo '/*' > .jj/.gitignore
# Make the Git repository non-bare and set HEAD
git config --unset core.bare
jj new @-
jj git colocate
```

We may officially support this in the future. If you try this, we would
appreciate feedback and bug reports.

## Branches

TODO: Describe how branches are mapped
Expand Down

0 comments on commit 6091659

Please sign in to comment.