ilyagr.bsky.social / jj
just playing with tangled
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

docs: document new config location on macOS

Nicole Patricia Mazzuca 85464373 2affe793

+18 -5
+9
CHANGELOG.md
··· 26 26 Please report any remaining issues you have with the Git 27 27 subprocessing path. 28 28 29 + * On macOS, config.toml files in `~/Library/Application Support/jj` are 30 + deprecated; one should instead use `$XDG_CONFIG_HOME/jj`. 31 + 29 32 ### New features 30 33 31 34 * Color-words diff has gained [an option to compare conflict pairs without ··· 37 40 `jj bookmark list` command. 38 41 39 42 ### Fixed bugs 43 + 44 + * On macOS, jj now defaults to looking for its config in `$XDG_CONFIG_HOME` 45 + rather than the more GUI-native `~/Library/Application Support`. 46 + 47 + * When there are existing config.toml files, don't suggest creating a new file 48 + in the config file picker. 40 49 41 50 ### Packaging changes 42 51
+9 -5
docs/config.md
··· 1549 1549 configs to be split across multiple files and combines well 1550 1550 with [Conditional Variables](#conditional-variables). 1551 1551 1552 - | Platform | Location of `<PLATFORM_SPECIFIC>` dir | Example config file location | 1553 - | :------- | :------------------------------------ | :-------------------------------------------------------- | 1554 - | Linux | `$XDG_CONFIG_HOME` or `$HOME/.config` | `/home/alice/.config/jj/config.toml` | 1555 - | macOS | `$HOME/Library/Application Support` | `/Users/Alice/Library/Application Support/jj/config.toml` | 1556 - | Windows | `{FOLDERID_RoamingAppData}` | `C:\Users\Alice\AppData\Roaming\jj\config.toml` | 1552 + | Platform | Location of `<PLATFORM_SPECIFIC>` dir | Example config file location | 1553 + | :-------------- | :------------------------------------ | :-------------------------------------------------------- | 1554 + | Linux and macOS | `$XDG_CONFIG_HOME` or `$HOME/.config` | `/home/alice/.config/jj/config.toml` | 1555 + | Windows | `{FOLDERID_RoamingAppData}` | `C:\Users\Alice\AppData\Roaming\jj\config.toml` | 1556 + 1557 + On macOS, jj used to put the user config in `~/Library/Application Support`, 1558 + and jj will still look there for backwards compatibility purposes; this is 1559 + considered a deprecated location, and you should use the new default 1560 + `XDG_CONFIG_HOME`. 1557 1561 1558 1562 The location of the `jj` user config files/directories can also be overridden with the 1559 1563 `JJ_CONFIG` environment variable. If it is not empty, it will be used instead