X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-reset.html;h=915201d1667e3b564aa4c13b421f6185a040252a;hb=5f32776d3bc48bfda61e2d0586d920bc3baf4b16;hp=83ee3679e9c34cce9c5fa905619dcb249c24f01f;hpb=74e8a2d5f3bf4da5598f5a78350efadaddb810b8;p=git.git diff --git a/git-reset.html b/git-reset.html index 83ee3679..915201d1 100644 --- a/git-reset.html +++ b/git-reset.html @@ -448,8 +448,8 @@ and resets the tip of the branch to that commit. Interrupted workflow
-

You can get interrupted by an ungent fix request while you are -still in the middle of a large change. The files in your +

Suppose you are interrupted by an urgent fix request while you +are in the middle of a large change. The files in your working tree are not in any shape to be committed yet, but you need to get to the other branch for a quick bugfix.

@@ -465,8 +465,8 @@ $ git reset --soft HEAD^ ;# go back to WIP state (2) $ git reset (3) (1) This commit will get blown away so a throw-away log message is OK. -(2) This removes the 'WIP' commit from the commit history, and makes - your working tree in the state just before you made that snapshot. +(2) This removes the 'WIP' commit from the commit history, and sets + your working tree to the state just before you made that snapshot. (3) After (2), the index file still has all the WIP changes you committed in (1). This sets it to the last commit you were basing the WIP changes on. @@ -488,7 +488,7 @@ $ git reset (3)