From 4f0db3607a36af37af865a7afdf9698b9be7eeba Mon Sep 17 00:00:00 2001 From: Yuya Nishihara Date: Wed, 7 Feb 2024 19:33:16 +0900 Subject: [PATCH] cli: fix doc about colocated repo created by "jj git init --git-repo=." Ref changes are imported and exported automatically so long as jj and git share the same workspace directory. --- cli/src/commands/git.rs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/cli/src/commands/git.rs b/cli/src/commands/git.rs index 87e5d4015..ea27c8c6f 100644 --- a/cli/src/commands/git.rs +++ b/cli/src/commands/git.rs @@ -142,11 +142,7 @@ pub struct GitInitArgs { /// If the specified `--git-repo` path happens to be the same as /// the `jj` repo path (both .jj and .git directories are in the /// same working directory), then both `jj` and `git` commands - /// will work on the repo, with the exception that changes from `jj` - /// will not be auto-exported to the git repo. - /// - /// Auto-exporting from `jj` to `git` is only enabled for new repos. - /// See `--colocate` above. + /// will work on the same repo. This is called a co-located repo. /// /// This option is mutually exclusive with `--colocate`. #[arg(long, conflicts_with = "colocate", value_hint = clap::ValueHint::DirPath)]