forked from mirrors/jj
Deployed 068f511
to prerelease with MkDocs 1.5.3 and mike 2.0.0
This commit is contained in:
parent
ec0d3a208d
commit
f7b5a6e0fa
4 changed files with 32 additions and 32 deletions
|
@ -497,9 +497,9 @@
|
|||
</li>
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="#i-accidentally-amended-the-working-copy-how-do-i-move-the-new-changes-into-its-own-commit" class="md-nav__link">
|
||||
<a href="#i-accidentally-changed-files-in-the-wrong-commit-how-do-i-move-the-recent-changes-into-another-commit" class="md-nav__link">
|
||||
<span class="md-ellipsis">
|
||||
I accidentally amended the working copy. How do I move the new changes into its own commit?
|
||||
I accidentally changed files in the wrong commit, how do I move the recent changes into another commit?
|
||||
</span>
|
||||
</a>
|
||||
|
||||
|
@ -1353,9 +1353,9 @@
|
|||
</li>
|
||||
|
||||
<li class="md-nav__item">
|
||||
<a href="#i-accidentally-amended-the-working-copy-how-do-i-move-the-new-changes-into-its-own-commit" class="md-nav__link">
|
||||
<a href="#i-accidentally-changed-files-in-the-wrong-commit-how-do-i-move-the-recent-changes-into-another-commit" class="md-nav__link">
|
||||
<span class="md-ellipsis">
|
||||
I accidentally amended the working copy. How do I move the new changes into its own commit?
|
||||
I accidentally changed files in the wrong commit, how do I move the recent changes into another commit?
|
||||
</span>
|
||||
</a>
|
||||
|
||||
|
@ -1491,7 +1491,7 @@ top of the PR you're working on and then do <code>jj new commit_with_local_chang
|
|||
You'll then need to use <code>jj new --before</code> to create new commits
|
||||
and <code>jj move --to</code>
|
||||
to move new changes into the correct commits.</p>
|
||||
<h3 id="i-accidentally-amended-the-working-copy-how-do-i-move-the-new-changes-into-its-own-commit">I accidentally amended the working copy. How do I move the new changes into its own commit?<a class="headerlink" href="#i-accidentally-amended-the-working-copy-how-do-i-move-the-new-changes-into-its-own-commit" title="Permanent link">¶</a></h3>
|
||||
<h3 id="i-accidentally-changed-files-in-the-wrong-commit-how-do-i-move-the-recent-changes-into-another-commit">I accidentally changed files in the wrong commit, how do I move the recent changes into another commit?<a class="headerlink" href="#i-accidentally-changed-files-in-the-wrong-commit-how-do-i-move-the-recent-changes-into-another-commit" title="Permanent link">¶</a></h3>
|
||||
<p>Use <code>jj obslog -p</code> to see how your working-copy commit has evolved. Find the
|
||||
commit you want to restore the contents to. Let's say the current commit (with
|
||||
the changes intended for a new commit) are in commit X and the state you wanted
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -2,132 +2,132 @@
|
|||
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/</loc>
|
||||
<lastmod>2024-01-27</lastmod>
|
||||
<lastmod>2024-01-29</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/FAQ/</loc>
|
||||
<lastmod>2024-01-27</lastmod>
|
||||
<lastmod>2024-01-29</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/branches/</loc>
|
||||
<lastmod>2024-01-27</lastmod>
|
||||
<lastmod>2024-01-29</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/code-of-conduct/</loc>
|
||||
<lastmod>2024-01-27</lastmod>
|
||||
<lastmod>2024-01-29</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/config/</loc>
|
||||
<lastmod>2024-01-27</lastmod>
|
||||
<lastmod>2024-01-29</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/conflicts/</loc>
|
||||
<lastmod>2024-01-27</lastmod>
|
||||
<lastmod>2024-01-29</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/contributing/</loc>
|
||||
<lastmod>2024-01-27</lastmod>
|
||||
<lastmod>2024-01-29</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/git-comparison/</loc>
|
||||
<lastmod>2024-01-27</lastmod>
|
||||
<lastmod>2024-01-29</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/git-compatibility/</loc>
|
||||
<lastmod>2024-01-27</lastmod>
|
||||
<lastmod>2024-01-29</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/github/</loc>
|
||||
<lastmod>2024-01-27</lastmod>
|
||||
<lastmod>2024-01-29</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/glossary/</loc>
|
||||
<lastmod>2024-01-27</lastmod>
|
||||
<lastmod>2024-01-29</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/install-and-setup/</loc>
|
||||
<lastmod>2024-01-27</lastmod>
|
||||
<lastmod>2024-01-29</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/operation-log/</loc>
|
||||
<lastmod>2024-01-27</lastmod>
|
||||
<lastmod>2024-01-29</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/related-work/</loc>
|
||||
<lastmod>2024-01-27</lastmod>
|
||||
<lastmod>2024-01-29</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/revsets/</loc>
|
||||
<lastmod>2024-01-27</lastmod>
|
||||
<lastmod>2024-01-29</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/sapling-comparison/</loc>
|
||||
<lastmod>2024-01-27</lastmod>
|
||||
<lastmod>2024-01-29</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/templates/</loc>
|
||||
<lastmod>2024-01-27</lastmod>
|
||||
<lastmod>2024-01-29</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/tutorial/</loc>
|
||||
<lastmod>2024-01-27</lastmod>
|
||||
<lastmod>2024-01-29</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/working-copy/</loc>
|
||||
<lastmod>2024-01-27</lastmod>
|
||||
<lastmod>2024-01-29</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/design/git-submodule-storage/</loc>
|
||||
<lastmod>2024-01-27</lastmod>
|
||||
<lastmod>2024-01-29</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/design/git-submodules/</loc>
|
||||
<lastmod>2024-01-27</lastmod>
|
||||
<lastmod>2024-01-29</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/design/run/</loc>
|
||||
<lastmod>2024-01-27</lastmod>
|
||||
<lastmod>2024-01-29</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/design/tracking-branches/</loc>
|
||||
<lastmod>2024-01-27</lastmod>
|
||||
<lastmod>2024-01-29</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/technical/architecture/</loc>
|
||||
<lastmod>2024-01-27</lastmod>
|
||||
<lastmod>2024-01-29</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/technical/concurrency/</loc>
|
||||
<lastmod>2024-01-27</lastmod>
|
||||
<lastmod>2024-01-29</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
<url>
|
||||
<loc>https://martinvonz.github.io/jj/prerelease/technical/conflicts/</loc>
|
||||
<lastmod>2024-01-27</lastmod>
|
||||
<lastmod>2024-01-29</lastmod>
|
||||
<changefreq>daily</changefreq>
|
||||
</url>
|
||||
</urlset>
|
Binary file not shown.
Loading…
Reference in a new issue