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.

Sign up for GitHub

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

cli: reference config settings for 'jj log -T' and 'jj git push -c' #4808

Merged
merged 1 commit into from
Nov 9, 2024
Merged

cli: reference config settings for 'jj log -T' and 'jj git push -c' #4808

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions cli/src/commands/git/push.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,9 @@ pub struct GitPushArgs {
revisions: Vec<RevisionArg>,
/// Push this commit by creating a bookmark based on its change ID (can be
/// repeated)
///
/// Use the `git.push-bookmark-prefix` setting to change the prefix for
/// generated names.
#[arg(long, short)]
change: Vec<RevisionArg>,
/// Only display what will change on the remote
Expand Down
7 changes: 6 additions & 1 deletion cli/src/commands/log.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,12 @@ pub(crate) struct LogArgs {
no_graph: bool,
/// Render each revision using the given template
///
/// For the syntax, see https://martinvonz.github.io/jj/latest/templates/
/// Run `jj log -T` to list the built-in templates.
///
/// You can also specify arbitrary template expressions. For the syntax,
/// see https://martinvonz.github.io/jj/latest/templates/.
///
/// If not specified, this defaults to the `templates.log` setting.
#[arg(long, short = 'T')]
template: Option<String>,
/// Show patch
Expand Down
8 changes: 7 additions & 1 deletion cli/tests/[email protected]
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1134,6 +1134,8 @@ Before the command actually moves, creates, or deletes a remote bookmark, it mak
* `--allow-private` — Allow pushing commits that are private
* `-r`, `--revisions <REVISIONS>` — Push bookmarks pointing to these commits (can be repeated)
* `-c`, `--change <CHANGE>` — Push this commit by creating a bookmark based on its change ID (can be repeated)

Use the `git.push-bookmark-prefix` setting to change the prefix for generated names.
* `--dry-run` — Only display what will change on the remote


Expand Down Expand Up @@ -1313,7 +1315,11 @@ Spans of revisions that are not included in the graph per `--revisions` are rend
* `--no-graph` — Don't show the graph, show a flat list of revisions
* `-T`, `--template <TEMPLATE>` — Render each revision using the given template

For the syntax, see https://martinvonz.github.io/jj/latest/templates/
Run `jj log -T` to list the built-in templates.

You can also specify arbitrary template expressions. For the syntax, see https://martinvonz.github.io/jj/latest/templates/.

If not specified, this defaults to the `templates.log` setting.
* `-p`, `--patch` — Show patch
* `-s`, `--summary` — For each path, show only whether it was modified, added, or deleted
* `--stat` — Show a histogram of the changes
Expand Down