Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

document the jj equivalent of git reset --soft #2976

Merged
merged 1 commit into from
Feb 10, 2024
Merged

document the jj equivalent of git reset --soft #2976

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions docs/git-comparison.md
View file
Open in desktop
jyn514 marked this conversation as resolved.
Show resolved Hide resolved
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 parent of the working copy, but keep its diff in the working copy</td>
<td><code>jj move --from @-</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