mirror of
https://github.com/martinvonz/jj.git
synced 2025-05-29 02:51:12 +00:00
Deployed 35440ce to prerelease with MkDocs 1.6.1 and mike 2.1.3
This commit is contained in:
parent
9660b5d568
commit
a833f56185
@ -380,6 +380,16 @@
|
|||||||
"type": "boolean",
|
"type": "boolean",
|
||||||
"description": "Whether jj should sign commits before pushing",
|
"description": "Whether jj should sign commits before pushing",
|
||||||
"default": "false"
|
"default": "false"
|
||||||
|
},
|
||||||
|
"subprocess": {
|
||||||
|
"type": "boolean",
|
||||||
|
"description": "Whether jj spawns a git subprocess for network operations (push/fetch/clone)",
|
||||||
|
"default": false
|
||||||
|
},
|
||||||
|
"executable-path": {
|
||||||
|
"type": "string",
|
||||||
|
"description": "Path to the git executable",
|
||||||
|
"default": "git"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -1243,6 +1243,15 @@
|
|||||||
</span>
|
</span>
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
|
</li>
|
||||||
|
|
||||||
|
<li class="md-nav__item">
|
||||||
|
<a href="#git-subprocessing-behaviour" class="md-nav__link">
|
||||||
|
<span class="md-ellipsis">
|
||||||
|
Git subprocessing behaviour
|
||||||
|
</span>
|
||||||
|
</a>
|
||||||
|
|
||||||
</li>
|
</li>
|
||||||
|
|
||||||
</ul>
|
</ul>
|
||||||
@ -2574,6 +2583,15 @@
|
|||||||
</span>
|
</span>
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
|
</li>
|
||||||
|
|
||||||
|
<li class="md-nav__item">
|
||||||
|
<a href="#git-subprocessing-behaviour" class="md-nav__link">
|
||||||
|
<span class="md-ellipsis">
|
||||||
|
Git subprocessing behaviour
|
||||||
|
</span>
|
||||||
|
</a>
|
||||||
|
|
||||||
</li>
|
</li>
|
||||||
|
|
||||||
</ul>
|
</ul>
|
||||||
@ -3600,6 +3618,20 @@ not considered a private commit. Commits that are immutable are also excluded
|
|||||||
from the private set.</p>
|
from the private set.</p>
|
||||||
<p>Private commits prevent their descendants from being pushed, since doing so
|
<p>Private commits prevent their descendants from being pushed, since doing so
|
||||||
would require pushing the private commit as well.</p>
|
would require pushing the private commit as well.</p>
|
||||||
|
<h3 id="git-subprocessing-behaviour">Git subprocessing behaviour<a class="headerlink" href="#git-subprocessing-behaviour" title="Permanent link">¶</a></h3>
|
||||||
|
<p>By default, Git remote interactions are handled by <a href="https://github.com/libgit2/libgit2"><code>libgit2</code></a>.
|
||||||
|
This sometimes causes <a href="https://github.com/jj-vcs/jj/issues/4979">SSH problems</a> that
|
||||||
|
cannot be solved by <code>jj</code> directly.</p>
|
||||||
|
<p>To sidestep this, there is an option to spawn a <code>git</code> subprocess to handle those
|
||||||
|
remote interactions:</p>
|
||||||
|
<div class="highlight"><pre><span></span><code><span class="k">[git]</span>
|
||||||
|
<span class="n">subprocess</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="kc">true</span>
|
||||||
|
</code></pre></div>
|
||||||
|
<p>Additionally, if <code>git</code> is not on your OS path, or you want to specify a
|
||||||
|
particular binary, you can:</p>
|
||||||
|
<div class="highlight"><pre><span></span><code><span class="k">[git]</span>
|
||||||
|
<span class="n">executable-path</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s2">"/path/to/git"</span>
|
||||||
|
</code></pre></div>
|
||||||
<h2 id="filesystem-monitor">Filesystem monitor<a class="headerlink" href="#filesystem-monitor" title="Permanent link">¶</a></h2>
|
<h2 id="filesystem-monitor">Filesystem monitor<a class="headerlink" href="#filesystem-monitor" title="Permanent link">¶</a></h2>
|
||||||
<p>In large repositories, it may be beneficial to use a "filesystem monitor" to
|
<p>In large repositories, it may be beneficial to use a "filesystem monitor" to
|
||||||
track changes to the working copy. This allows <code>jj</code> to take working copy
|
track changes to the working copy. This allows <code>jj</code> to take working copy
|
||||||
|
File diff suppressed because one or more lines are too long
Loading…
x
Reference in New Issue
Block a user