mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-15 16:53:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

cli: fix doc about colocated repo created by "jj git init --git-repo=."

Browse source 
Ref changes are imported and exported automatically so long as jj and git
share the same workspace directory.
This commit is contained in:
Yuya Nishihara 2024-02-07 19:33:16 +09:00 committed by Martin von Zweigbergk
parent b13cfef095
commit 4f0db3607a
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cli/src/commands/git.rs
View file

@ -142,11 +142,7 @@ pub struct GitInitArgs {
/// If the specified `--git-repo` path happens to be the same as /// If the specified `--git-repo` path happens to be the same as
/// the `jj` repo path (both .jj and .git directories are in the /// the `jj` repo path (both .jj and .git directories are in the
/// same working directory), then both `jj` and `git` commands /// same working directory), then both `jj` and `git` commands
/// will work on the repo, with the exception that changes from `jj` /// will work on the same repo. This is called a co-located repo.
/// will not be auto-exported to the git repo.
///
/// Auto-exporting from `jj` to `git` is only enabled for new repos.
/// See `--colocate` above.
/// ///
/// This option is mutually exclusive with `--colocate`. /// This option is mutually exclusive with `--colocate`.
#[arg(long, conflicts_with = "colocate", value_hint = clap::ValueHint::DirPath)] #[arg(long, conflicts_with = "colocate", value_hint = clap::ValueHint::DirPath)]