docs/git-compatibility.md: preserve working copy files when co-locating

Use `jj new && jj undo` instead of `jj new @-` at the end of converting to a co-located repository, because the latter "stashes" newly added working copy changes into a sibling commit. See also: #4945 Signed-off-by: Tim Janik <[email protected]>
jj-vcs · Nov 22, 2024 · 13abedc · 13abedc
1 parent d5bf148
commit 13abedc
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/docs/git-compatibility.md b/docs/git-compatibility.md
@@ -174,15 +174,16 @@ technically possible (though not officially supported) to convert it into a
 co-located repo like so:
 
 ```bash
+# Ignore the .jj directory in Git
+echo '/*' > .jj/.gitignore
 # 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 @-
+# Convince jj to update .git/HEAD to point to the working-copy commit's parent
+jj new && jj undo
 ```
 
 We may officially support this in the future. If you try this, we would