Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

docs: replace jj files, jj chmod with jj file list, jj file chmod. #3956

Merged
merged 2 commits into from
Jun 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cli/src/cli_util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2391,8 +2391,8 @@ pub struct EarlyArgs {
pub color: Option<ColorChoice>,
/// Silence non-primary command output
///
/// For example, `jj files` will still list files, but it won't tell you if
/// the working copy was snapshotted or if descendants were rebased.
/// For example, `jj file list ` will still list files, but it won't tell
/// you if the working copy was snapshotted or if descendants were rebased.
///
/// Warnings and errors will still be printed.
#[arg(long, global = true, action = ArgAction::SetTrue)]
Expand Down
4 changes: 2 additions & 2 deletions cli/src/commands/file/chmod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ enum ChmodMode {

/// Sets or removes the executable bit for paths in the repo
///
/// Unlike the POSIX `chmod`, `jj chmod` also works on Windows, on conflicted
/// files, and on arbitrary revisions.
/// Unlike the POSIX `chmod`, `jj file chmod` also works on Windows, on
/// conflicted files, and on arbitrary revisions.
#[derive(clap::Args, Clone, Debug)]
pub(crate) struct ChmodArgs {
mode: ChmodMode,
Expand Down
4 changes: 2 additions & 2 deletions cli/tests/[email protected]
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ To get started, see the tutorial at https://github.com/martinvonz/jj/blob/main/d
* `--color <WHEN>` — When to colorize output (always, never, debug, auto)
* `--quiet` — Silence non-primary command output

For example, `jj files` will still list files, but it won't tell you if the working copy was snapshotted or if descendants were rebased.
For example, `jj file list ` will still list files, but it won't tell you if the working copy was snapshotted or if descendants were rebased.

Warnings and errors will still be printed.
* `--no-pager` — Disable the pager
Expand Down Expand Up @@ -698,7 +698,7 @@ File operations

Sets or removes the executable bit for paths in the repo

Unlike the POSIX `chmod`, `jj chmod` also works on Windows, on conflicted files, and on arbitrary revisions.
Unlike the POSIX `chmod`, `jj file chmod` also works on Windows, on conflicted files, and on arbitrary revisions.

**Usage:** `jj file chmod [OPTIONS] <MODE> <PATHS>...`

Expand Down
2 changes: 1 addition & 1 deletion docs/filesets.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ jj diff '~Cargo.lock'
List files in `src` excluding Rust sources.

```
jj files 'src ~ glob:"**/*.rs"'
jj file list 'src ~ glob:"**/*.rs"'
```

Split a revision in two, putting `foo` into the second commit.
Expand Down
2 changes: 1 addition & 1 deletion docs/git-comparison.md
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ parent.
</tr>
<tr>
<td>Search among files versioned in the repository</td>
<td><code>grep foo $(jj files)</code>, or <code>rg --no-require-git foo</code></td>
<td><code>grep foo $(jj file list)</code>, or <code>rg --no-require-git foo</code></td>
<td><code>git grep foo</code></td>
</tr>
<tr>
Expand Down