jj-restore(1)

πŸ’– jj-restore(1) β€” the general commands manual, but make it slay πŸ’–

okay bestie, buckle up, we're doing jj restore and honestly? she's iconic. this is the General Commands Manual entry, and it's giving "fix my mess" energy in the best way possible. πŸŽ€


✨ NAME ✨

jj-restore β€” restore paths from another revision πŸ¦‹


✨ SYNOPSIS ✨

jj restore [-f|--from] [-R|--repository] [--ignore-working-copy]
[-t|--into] [-c|--changes-in] [--no-integrate-operation]
[--ignore-immutable] [--at-operation] [-i|--interactive] [--debug]
[--tool] [--color] [--restore-descendants] [--quiet] [--no-pager]
[--config] [--config-file] [-h|--help] [FILESETS]

✨ DESCRIPTION ✨

so like, restore paths from another revision. that's the whole vibe. πŸ’…

which means: the paths get the exact same content in the destination (--into) as they had in the source (--from). no cap. and this is typically used for undoing changes to some paths in the working copy:

jj restore <paths>

if you only specify one of --from or --into, the other one defaults to the working copy. easy. 🫢

and when you specify neither --from nor --into? the command restores into the working copy from its parent(s). so jj restore with no arguments is basically similar to jj abandon, except β€” and this is the key part, don't miss it β€” it leaves an empty revision with its description and other metadata preserved. πŸ‘‘

also: check out jj diffedit if you'd like to restore portions of files rather than entire files. different tool, different energy, same excellence. 🌸


✨ OPTIONS ✨

  • -f, --from <REVSET> β€” revision to restore from (source) πŸ¦‹
  • -t, --into <REVSET> β€” revision to restore into (destination) πŸŽ€
  • -c, --changes-in <REVSET> β€” undo the changes in a revision as compared to the merge of its parents.

this undoes the changes that can be seen with jj diff -r REVSET. if REVSET only has a single parent, this option is equivalent to jj restore --into REVSET --from REVSET-. periodt. ✨

and the default behavior of jj restore is equivalent to jj restore --changes-in @. that's literally the default, bestie.

  • -i, --interactive β€” interactively choose which parts to restore πŸ‘†βœ¨
  • --tool <NAME> β€” specify diff editor to be used (implies --interactive) πŸ’…
  • --restore-descendants β€” preserve the content (not the diff) when rebasing descendants πŸ”₯
  • -h, --help β€” print help (see a summary with '-h') πŸ™ˆ
  • [FILESETS] β€” restore only these paths (instead of all paths) 🌈

🌍 GLOBAL OPTIONS 🌍

  • -R, --repository <REPOSITORY> β€” path to repository to operate on.

by default, Jujutsu searches for the closest .jj/ directory in an ancestor of the current working directory. it's giving "where's my repo" but make it automatic. πŸ”

  • --ignore-working-copy β€” don't snapshot the working copy, and don't update it.

by default, Jujutsu snapshots the working copy at the beginning of every command. the working copy is also updated at the end of the command, if the command modified the working-copy commit (@). if you want to avoid snapshotting the working copy and instead see a possibly stale working-copy commit, you can use --ignore-working-copy. this may be useful e.g. in a command prompt, especially if you have another process that commits the working copy. πŸ‘€

loading the repository at a specific operation with --at-operation implies --ignore-working-copy.
  • --no-integrate-operation β€” run the command as usual but don't integrate any operations.

when this option is given, the operations will still be created as usual but they will not be integrated to the operation log. the working copy will also not be updated.

the command will print the resulting operation ID. you can pass that to e.g. jj --at-op to inspect the resulting repo state, or you can pass it to jj op restore to restore the repo to that state. you can also pass the ID to jj op integrate to integrate the operation. so many doors open. πŸšͺ✨

note that this does not prevent side effects outside the repo. for example, jj git push --no-integrate-operation will still perform the push. πŸ’€
  • --ignore-immutable β€” allow rewriting immutable commits.

by default, Jujutsu prevents rewriting commits in the configured set of immutable commits. this option disables that check and lets you rewrite any commit but the root commit. main character energy, honestly. πŸ‘‘

this option only affects the check. it does not affect the immutable_heads() revset or the immutable template keyword.

  • --at-operation <AT_OPERATION> β€” operation to load the repo at.

operation to load the repo at. by default, Jujutsu loads the repo at the most recent operation, or at the merge of the divergent operations if any. πŸŒ€

you can use --at-op=<operation ID> to see what the repo looked like at an earlier operation. for example jj --at-op=<operation ID> st will show you what jj st would have shown you when the given operation had just finished. --at-op=@ is pretty much the same as the default except that divergent operations will never be merged. time travel, lowkey. ⏰

use jj op log to find the operation ID you want. any unambiguous prefix of the operation ID is enough. πŸ™Œ

when loading the repo at an earlier operation, the working copy will be ignored, as if --ignore-working-copy had been specified.

it is possible to run mutating commands when loading the repo at an earlier operation. doing that is equivalent to having run concurrent commands starting at the earlier operation. there's rarely a reason to do that, but it is possible. (chaos is an option, just saying πŸ“)

  • --debug β€” enable debug logging πŸ›
  • --color <WHEN> β€” when to colorize output.

possible values:

  • always
  • never
  • debug
  • auto
  • --quiet β€” silence non-primary command output.

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 πŸ“„
  • --config <NAME=VALUE> β€” additional configuration options (can be repeated).

the name should be specified as TOML dotted keys. the value should be specified as a TOML expression. if string value isn't enclosed by any TOML constructs (such as array notation), quotes can be omitted. cute and flexible. πŸŽ€

  • --config-file <PATH> β€” additional configuration files (can be repeated) πŸ“

and that's the whole page, bestie!! you ate. πŸ’–βœ¨πŸ¦‹

this was page restore from jj-restore(1) β€” General Commands Manual β€” signing off with all the love, no cap πŸ«ΆπŸŽ€πŸŒΈ

πŸ“¦ where this page comes from