Skip to content

Commit

Permalink
document the jj equivalent of git reset --soft
Browse files Browse the repository at this point in the history
  • Loading branch information
jyn514 committed Feb 7, 2024
1 parent d66fcf2 commit 48a8a73
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions docs/git-comparison.md
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,11 @@ parent.
<td><code>git reset --hard</code> (same as abandoning a change since Git
has no concept of a "change")</td>
</tr>
<tr>
<td>Abandon the current change, but keep its diff in the working copy</td>
<td><code>jj move --from @- --to @</code></td>
<td><code>git reset --soft HEAD~</code></td>
</tr>
<tr>
<td>Discard working copy changes in some files</td>
<td><code>jj restore &lt;paths&gt;...</code></td>
Expand Down

0 comments on commit 48a8a73

Please sign in to comment.