Skip to content

Commit

Permalink
Deploying to gh-pages from @ 4330356 🚀
Browse files Browse the repository at this point in the history
  • Loading branch information
dmerejkowsky committed Dec 16, 2023
1 parent 1691aa2 commit 78220a4
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
4 changes: 2 additions & 2 deletions ref/cli/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -988,10 +988,10 @@ <h2 id="usage">Usage<a class="headerlink" href="#usage" title="Permanent link">&
<li>Shows repositories not on the expected branch</li>
</ul>
</dd>
<dt>tsrc sync [--correct-branch/-c]</dt>
<dt>tsrc sync [--no-correct-branch]</dt>
<dd>Updates all the repositories and shows a summary at the end.
If any of the repositories is not on the configured branch, but it is clean
and the <code>--correct-branch</code>/<code>-c</code> flag is set, then the branch is changed to
and the <code>--no-correct-branch</code> flag is NOT set, then the branch is changed to
the configured one and then the repository is updated. Otherwise that repository
will not be not updated.</dd>
<dt>tsrc version</dt>
Expand Down
7 changes: 4 additions & 3 deletions ref/sync/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -789,9 +789,10 @@ <h1 id="sync_algorithm">Sync algorithm<a class="headerlink" href="#sync_algorith
<ul>
<li>Run <code>git fetch --tags --prune</code></li>
<li>Check if the repository is on a branch</li>
<li>Check if the currently checked out branch matches the one configured in
the manifest. If it does not but the <code>--correct-branch</code> flag is set
and the repository is clean, the branch is changed to the configured one. </li>
<li>Check if the currently checked out branch matches the one configured
in the manifest. If it does not, the repository is clean and the
<code>--no-correct-branch</code> flag is NOT set, the branch is changed to the
configured one.</li>
<li>Check if the repository is dirty</li>
<li>Try and run a fast-forward merge</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion search/search_index.json

Large diffs are not rendered by default.

Binary file modified sitemap.xml.gz
Binary file not shown.

0 comments on commit 78220a4

Please sign in to comment.