Skip to content

Rebase of pull request 64 onto latest gh-pages #73

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

Merged
merged 2 commits into from
Jan 9, 2014
Merged

Rebase of pull request 64 onto latest gh-pages #73

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96186d0
git reset does not affect commit, but changes index, stage to them
randomecho May 22, 2013
450a1c1
Clarify where git reset moves HEAD, affect on stage, index
randomecho May 22, 2013
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
12 changes: 7 additions & 5 deletions basic/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -612,7 +612,7 @@ <h2>

<h4>
git reset HEAD
<small>undo the last commit and unstage the files</small>
<small>unstage files from index and reset pointer to HEAD</small>
</h4>

<p>First, you can use it to unstage something that has been
Expand Down Expand Up @@ -691,7 +691,7 @@ <h4>

<h4>
git reset --soft
<small>undo the last commit</small>
<small>moves HEAD to specified commit reference, index and staging are untouched</small>
</h4>

<p>The first thing <code>git reset</code> does is undo the last
Expand Down Expand Up @@ -721,11 +721,12 @@ <h4>

<h4>
git reset --hard
<small>undo the last commit, unstage files AND undo any changes in the working directory</small>
<small>unstage files AND undo any changes in the working directory since last commit</small>
</h4>

<p>The third option is to go <code>--hard</code> and make your working
directory look like the index, unstage files and undo the last commit.
directory look like the index, unstage files and undo any changes made
since the last commit.
This is the most dangerous option and not working directory safe. Any
changes not in the index or have not been commited will be lost.</p>

Expand All @@ -752,7 +753,8 @@ <h4>

<p>In the above example, while we had both changes ready to commit and
ready to stage, a <code>git reset --hard</code> wiped them out.
On top of that, the last commit has been undone.</p>
The working tree and staging area are reset to the tip of the current
branch or HEAD.</p>

<p>You can replace <code>HEAD</code> with a commit SHA-1 or another
parent reference to reset to that specific point.</p>
Expand Down