jj-git-colocation(1)

πŸ’– jj-git-colocation(1) β€” General Commands Manual πŸ’–

okay bestie, welcome to jj-git-colocation, the little command that runs the whole "my Jujutsu repo and my Git repo are living in the same house" situation. 🏠✨ It's the parent command for the colocation subcommands, and no cap, it's giving gatekeeper-of-the-closet energy. Let's go. πŸ’…


✨ NAME ✨

jj-git-colocation β€” manage Jujutsu repository colocation with Git πŸ¦‹


🌸 SYNOPSIS 🌸

jj git colocation [-R|--repository] [--ignore-working-copy]
[--no-integrate-operation] [--ignore-immutable] [--at-operation]
[--debug] [--color] [--quiet] [--no-pager] [--config] [--config-file]
[-h|--help] <subcommands>

πŸŽ€ DESCRIPTION πŸŽ€

Manage Jujutsu repository colocation with Git. That's the whole vibe. It doesn't do the thing itself β€” it hands you the subcommands that do the thing. Main character energy, but a delegator. πŸ‘‘


πŸ‘‘ OPTIONS πŸ‘‘

  • -h, --help β€” print the help. lowercase -h gives you the short-and-sweet summary version, iykyk.

πŸ’œ GLOBAL OPTIONS πŸ’œ

  • -R, --repository <REPOSITORY> β€” the path to the repo you wanna operate on. πŸ—‚οΈ By default, Jujutsu goes hunting for the closest .jj/ directory up in an ancestor of wherever you're currently standing (your current working directory).
  • --ignore-working-copy β€” don't snapshot the working copy, and don't update it. πŸ™ˆ By default, Jujutsu snapshots the working copy at the start of every single command, and then updates the working copy at the end too β€” if the command modified the working-copy commit (@). So if you wanna skip the snapshotting and just look at a possibly stale working-copy commit instead, this is your girl. It's lowkey useful in stuff like a command prompt, especially if you've got another process out here committing the working copy. ⚠️ Also: loading the repo 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. 🚫 With this on, the operations still get created like normal, they just don't get integrated into the operation log. The working copy also won't be updated. The command will print the resulting operation ID for you β€” you can pass that to e.g. jj --at-op to peek at the resulting repo state, or hand 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. πŸ“ Heads up though: this does not stop side effects outside the repo. For example, jj git push --no-integrate-operation will still perform the push. fr fr, the push happens.
  • --ignore-immutable β€” allow rewriting immutable commits. πŸ”“ By default Jujutsu blocks rewriting commits in the configured set of immutable commits, and this option turns that check off so you can rewrite any commit β€” except the root commit, that one's untouchable, periodt. This option only affects the check. It does not affect the immutable_heads() revset or the immutable template keyword.
  • --at-operation <AT_OPERATION> β€” the 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 there are any. You can use --at-op=<operation ID> to see what the repo looked like at an earlier operation. Example: jj --at-op=<operation ID> st will show you what jj st would have shown you back when the given operation had just finished. And --at-op=@ is pretty much the same as the default, except divergent operations will never be merged. Use jj op log to find the operation ID you want β€” any unambiguous prefix of the operation ID is enough. πŸ” When you load the repo at an earlier operation, the working copy gets ignored, as if --ignore-working-copy had been specified. And yes, 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. πŸ™ˆ
  • --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 though β€” no hiding those. ⚠️
  • --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 the string value isn't enclosed by any TOML constructs (such as array notation), quotes can be omitted.
  • --config-file <PATH> β€” additional configuration files (can be repeated). πŸ”

πŸ¦‹ SUBCOMMANDS πŸ¦‹


bestie reminder: this page is from the colocation source, dated under the jj-git-colocation(1) manual entry. go slay, and may your repos always be exactly as colocated as you intended. πŸ’–βœ¨πŸŽ€
πŸ“¦ where this page comes from