carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-09-24 18:50:09 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Switch jj settings to 'jj config set' because of repo (#7007)

Browse Source 
jj moved the repo config outside the repo. The config.toml might exist
as a symlink in older repos (probably migration), but not clean repos.
So, overall, just switching the advice setup to make it a bit more
robust with config locations.

Also adding "trunk" to the repo config.

Assisted-by: Google Antigravity with Gemini
This commit is contained in:
Jon Ross-Perkins
2026-04-01 21:36:56 +00:00
committed by GitHub
parent 0075d530b9
commit cd6ab7ce8e
1 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/project/contribution_tools.md
+19 -20
View File
@@ -257,47 +257,46 @@ system that can be used instead of or alongside Git. See the
for more information.
If you use `jj`, you may find the following configuration snippets (added to
`~/.config/jj/config.toml`) helpful for your workflow:
`jj config path --user`) helpful for your workflow:
```toml
[aliases]
```sh
# Clean up untracked or abandoned commits.
abandon-untagged = ["abandon", "all() & ~ancestors(@ | bookmarks() | remote_bookmarks())"]
jj config set --user aliases.abandon-untagged '["abandon", "all() & ~ancestors(@ | bookmarks() | remote_bookmarks())"]'
[ui]
# Use Git-style conflict markers, which VS Code can provide merge support for.
conflict-marker-style = "git"
jj config set --user ui.conflict-marker-style 'git'
[ui.diff]
# Produce Git-compatible diff format.
format = "git"
jj config set --user ui.diff.format 'git'
[templates]
# Automatically add a trailer to commits to indicate that they were AI-assisted.
commit_trailers = '''
"Assisted-by: My AI Tool"'''
jj config set --user templates.commit_trailers "$(echo -e "'''\n\"Assisted-by: My AI Tool\"'''")"
[revsets]
# Make `jj bookmark advance` / `jj b a` only move bookmarks that point to
# mutable commits, and move them to the most recent non-empty descendant.
bookmark-advance-from = "heads(::to & bookmarks()) & ~immutable_heads()"
bookmark-advance-to = 'heads(::@ & ~(description("") & empty() & ~merges()))'
jj config set --user revsets.bookmark-advance-from 'heads(::to & bookmarks()) & ~immutable_heads()'
jj config set --user revsets.bookmark-advance-to 'heads(::@ & ~(description("") & empty() & ~merges()))'
```
As well as this per-repository configuration (added to `.jj/config.toml`)
<!-- google-doc-style-ignore -->
As well as this per-repository configuration (added to `jj config path --repo`)
describing how your GitHub checkout is configured:
```toml
[remotes.origin]
```sh
# Automatically track all remote bookmarks.
auto-track-bookmarks = "*"
jj config set --repo remotes.origin.auto-track-bookmarks '*'
# `trunk()` is a jj builtin, but defaults to `main@upstream`.
jj config set --repo 'revset-aliases."trunk()"' 'trunk@upstream'
[revset-aliases]
# Treat github.com/carbon-language/carbon-lang as immutable, but treat your fork
# as mutable.
"immutable_heads()" = "remote_bookmarks(*, upstream)"
jj config set --repo 'revset-aliases."immutable_heads()"' 'remote_bookmarks(*, upstream)'
```
<!-- google-doc-style-resume -->
The above assumes that you have configured the remote name `origin` to refer to
your fork and `upstream` to refer to `github.com/carbon-language/carbon-lang`,
and will need to be adjusted if you use different remote names.