diff options
| author | J. Bruce Fields <bfields@fieldses.org> | 2006-01-21 18:54:11 -0500 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-01-21 19:11:51 -0800 |
| commit | 8278ac2f4a50a8aca0dca490d2b8b99b11e266e1 (patch) | |
| tree | 6406e000c0c7c07e94f559b31cefa901b3b5cce2 /Documentation/git-reset.txt | |
| parent | 8e76c79f4a1e66ed8e371d1232e879f45141dce1 (diff) | |
| download | git-8278ac2f4a50a8aca0dca490d2b8b99b11e266e1.tar.gz | |
Minor git-reset and git-commit documentation fixes
Minor copyediting of recent additions to git-commit and git-reset
documentation.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-reset.txt')
| -rw-r--r-- | Documentation/git-reset.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt index 315683a6d5..b4e737e660 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. |