From c8f703f14b09652f56f5de071bd40606ddc38cb6 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Fri, 9 Feb 2024 12:04:15 -0600 Subject: [PATCH] docs: fix some automerge fallout I enabled automerge for #2994, but forgot to actually *push* my changes before resolving all the conversations, so GitHub insta-merged it. This just addresses Ilya and Philip's final comments on #2994. Signed-off-by: Austin Seipp --- docs/config.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/config.md b/docs/config.md index 711c649306..b42b664e1b 100644 --- a/docs/config.md +++ b/docs/config.md @@ -525,7 +525,7 @@ To change this behavior, you can modify the [repository configuration](#config-files-and-toml) variable `git.fetch`, which can be a single remote, or a list of remotes to fetch from multiple places: -``` +```sh jj config set --repo git.fetch "upstream" jj config set --repo git.fetch '["origin", "upstream"]' ``` @@ -533,10 +533,14 @@ jj config set --repo git.fetch '["origin", "upstream"]' Similarly, you can also set the variable `git.push` to cause `jj git push` to push to a different remote: -``` +```sh jj config set --repo git.push "github" ``` +Note that unlike `git.fetch`, `git.push` can currently only be a single remote. +This is not a hard limitation, and could be changed in the future if there is +demand. + ### Automatic local branch creation When `jj` imports a new remote-tracking branch from Git, it can also create a