X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-reset.txt;h=b4e737e660ba9532b9e69ffe71b80899097dbd4d;hb=8278ac2f4a50a8aca0dca490d2b8b99b11e266e1;hp=315683a6d575bb158ec621d7677ff60bcdbce3eb;hpb=8e76c79f4a1e66ed8e371d1232e879f45141dce1;p=git.git diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt index 315683a6..b4e737e6 100644 --- a/Documentation/git-reset.txt +++ b/Documentation/git-reset.txt @@ -147,8 +147,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. + @@ -164,8 +164,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.