ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

docs: use git switch/restore in command-equivalence table

Browse source 
IIUC, the consensus in the Git project is that the overloaded nature
of `git checkout` for many use cases was a mistake, and `git
switch/restore` are meant to replace it.
This commit is contained in:
Martin von Zweigbergk 2023-05-07 16:04:32 -07:00 committed by Martin von Zweigbergk
parent 6a1bb1c0a9
commit 01755176c6
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
docs/git-comparison.md
View file

@ -178,7 +178,7 @@ parent.
<tr>
<td>Discard working copy changes in some files</td>
<td><code>jj restore &lt;paths&gt;...</code></td>
<td><code>git checkout -- &lt;paths&gt;...</code></td>
<td><code>git restore &lt;paths&gt;...</code> or <code>git checkout HEAD -- &lt;paths&gt;...</code></td>
</tr>
<tr>
<td>Edit description (commit message) of the current change</td>
@ -199,8 +199,9 @@ parent.
<tr>
<td>Start working on a new change based on the &lt;main&gt; branch</td>
<td><code>jj co main</code></td>
<td><code>git checkout -b topic main</code> (may need to stash or commit
first)</td>
<td><code>git switch -c topic main</code> or
<code>git checkout -b topic main</code> (may need to stash or commit
first)</td>
</tr>
<tr>
<td>Move branch A onto branch B</td>