Skip to content

Commit e96af18

Browse files
committed
cli: document that jj git import/export are not needed when colocated
Closes #7910
1 parent 5aee657 commit e96af18

File tree

3 files changed

+10
-0
lines changed

3 files changed

+10
-0
lines changed

cli/src/commands/git/export.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ use crate::git_util::print_git_export_stats;
2020
use crate::ui::Ui;
2121

2222
/// Update the underlying Git repo with changes made in the repo
23+
///
24+
/// There is no need to run this command if you're in colocated repo because the
25+
/// export happens automatically there.
2326
#[derive(clap::Args, Clone, Debug)]
2427
pub struct GitExportArgs {}
2528

cli/src/commands/git/import.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ use crate::ui::Ui;
2323
///
2424
/// If a working-copy commit gets abandoned, it will be given a new, empty
2525
/// commit. This is true in general; it is not specific to this command.
26+
///
27+
/// There is no need to run this command if you're in colocated repo because the
28+
/// import happens automatically there.
2629
#[derive(clap::Args, Clone, Debug)]
2730
pub struct GitImportArgs {}
2831

cli/tests/[email protected]

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1401,6 +1401,8 @@ Show the current colocation status
14011401

14021402
Update the underlying Git repo with changes made in the repo
14031403

1404+
There is no need to run this command if you're in colocated repo because the export happens automatically there.
1405+
14041406
**Usage:** `jj git export`
14051407

14061408

@@ -1438,6 +1440,8 @@ Update repo with changes made in the underlying Git repo
14381440

14391441
If a working-copy commit gets abandoned, it will be given a new, empty commit. This is true in general; it is not specific to this command.
14401442

1443+
There is no need to run this command if you're in colocated repo because the import happens automatically there.
1444+
14411445
**Usage:** `jj git import`
14421446

14431447

0 commit comments

Comments
 (0)