forked from mirrors/jj
Deployed 6e72b1c
to prerelease with MkDocs 1.6.0 and mike 2.1.1
This commit is contained in:
parent
1f022e085b
commit
a40993469f
5 changed files with 32 additions and 8 deletions
|
@ -6663,7 +6663,13 @@ will be removed in a future version.</p>
|
|||
</ul>
|
||||
<h6 id="options_20"><strong>Options:</strong><a class="headerlink" href="#options_20" title="Permanent link">¶</a></h6>
|
||||
<ul>
|
||||
<li><code>--colocate</code> — Whether or not to colocate the Jujutsu repo with the git repo</li>
|
||||
<li>
|
||||
<p><code>--remote <REMOTE_NAME></code> — Name of the newly created remote</p>
|
||||
<p>Default value: <code>origin</code></p>
|
||||
</li>
|
||||
<li>
|
||||
<p><code>--colocate</code> — Whether or not to colocate the Jujutsu repo with the git repo</p>
|
||||
</li>
|
||||
</ul>
|
||||
<h2 id="jj-git-export"><code>jj git export</code><a class="headerlink" href="#jj-git-export" title="Permanent link">¶</a></h2>
|
||||
<p>Update the underlying Git repo with changes made in the repo</p>
|
||||
|
|
|
@ -1552,9 +1552,9 @@ parent.</p>
|
|||
</tr>
|
||||
<tr>
|
||||
<td>Clone an existing repo</td>
|
||||
<td><code>jj git clone <source> <destination></code> (there is no support
|
||||
<td><code>jj git clone <source> <destination> [--remote <remote name>]</code> (there is no support
|
||||
for cloning non-Git repos yet)</td>
|
||||
<td><code>git clone <source> <destination></code></td>
|
||||
<td><code>git clone <source> <destination> [--origin <remote name>]</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Update the local repo with all bookmarks from a remote</td>
|
||||
|
|
|
@ -1626,6 +1626,9 @@ update the Git repo with changes made in the Jujutsu repo.</p>
|
|||
[<destination>]</code>. For example, <code>jj git clone
|
||||
https://github.com/octocat/Hello-World</code> will clone GitHub's "Hello-World" repo
|
||||
into a directory by the same name.</p>
|
||||
<p>By default, the remote repository will be named <code>origin</code>. You can use
|
||||
a name of your choice by adding <code>--remote <remote name></code> to the <code>jj
|
||||
git clone</code> command.</p>
|
||||
<h2 id="co-located-jujutsugit-repos">Co-located Jujutsu/Git repos<a class="headerlink" href="#co-located-jujutsugit-repos" title="Permanent link">¶</a></h2>
|
||||
<p>A "co-located" Jujutsu repo is a hybrid Jujutsu/Git repo. These can be created
|
||||
if you initialize the Jujutsu repo in an existing Git repo by running <code>jj git
|
||||
|
|
|
@ -1849,15 +1849,30 @@ the <a href="../tutorial/#conflicts">tutorial</a>.</p>
|
|||
<p>It is common to use several remotes when contributing to a shared repository.
|
||||
For example, "upstream" can designate the remote where the changes will be
|
||||
merged through a pull-request while "origin" is your private fork of the
|
||||
project. In this case, you might want to <code>jj git fetch</code> from "upstream" and to
|
||||
<code>jj git push</code> to "origin".</p>
|
||||
<p>You can configure the default remotes to fetch from and push to in your
|
||||
configuration file (for example <code>.jj/repo/config.toml</code>):</p>
|
||||
project.</p>
|
||||
<div class="highlight"><pre><span></span><code>$<span class="w"> </span>jj<span class="w"> </span>git<span class="w"> </span>clone<span class="w"> </span>--remote<span class="w"> </span>upstream<span class="w"> </span>https://github.com/upstream-org/repo
|
||||
$<span class="w"> </span><span class="nb">cd</span><span class="w"> </span>repo
|
||||
$<span class="w"> </span>jj<span class="w"> </span>git<span class="w"> </span>remote<span class="w"> </span>add<span class="w"> </span>origin<span class="w"> </span>git@github.com:your-org/your-repo-fork
|
||||
</code></pre></div>
|
||||
<p>This will automatically setup your repository to track the main
|
||||
bookmark from the upstream repository, typically <code>main@upstream</code>
|
||||
or <code>master@upstream</code>.</p>
|
||||
<p>You might want to <code>jj git fetch</code> from "upstream" and to <code>jj git push</code>
|
||||
to "origin". You can configure the default remotes to fetch from and
|
||||
push to in your configuration file (for example,
|
||||
<code>.jj/repo/config.toml</code>):</p>
|
||||
<div class="highlight"><pre><span></span><code><span class="k">[git]</span>
|
||||
<span class="n">fetch</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">"upstream"</span>
|
||||
<span class="n">push</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">"origin"</span>
|
||||
</code></pre></div>
|
||||
<p>The default for both <code>git.fetch</code> and <code>git.push</code> is "origin".</p>
|
||||
<p>If you usually work on a project from several computers, you may
|
||||
configure <code>jj</code> to fetch from both repositories by default, in order to
|
||||
keep your own bookmarks synchronized through your <code>origin</code> repository:</p>
|
||||
<div class="highlight"><pre><span></span><code><span class="k">[git]</span>
|
||||
<span class="n">fetch</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="p">[</span><span class="s2">"upstream"</span><span class="p">,</span><span class="w"> </span><span class="s2">"origin"</span><span class="p">]</span>
|
||||
<span class="n">push</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">"origin"</span>
|
||||
</code></pre></div>
|
||||
<div class="footnote">
|
||||
<hr />
|
||||
<ol>
|
||||
|
|
File diff suppressed because one or more lines are too long
Loading…
Reference in a new issue