diff options
| author | Thomas Rast <trast@student.ethz.ch> | 2010-07-18 20:23:25 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-07-19 09:12:07 -0700 |
| commit | 8bb95bbca774506b15a1ca3b7ae233118956e45e (patch) | |
| tree | a2e764b90041d28e2b4150ebea5e4df9425f397b /Documentation | |
| parent | 28bb4b276af31af07163b28cd790b51f7c15c4b6 (diff) | |
| download | git-8bb95bbca774506b15a1ca3b7ae233118956e45e.tar.gz git-8bb95bbca774506b15a1ca3b7ae233118956e45e.tar.xz | |
Documentation/reset: reorder examples to match description
A previous commit moved the <paths> mode (undoes git-add) to the front
in the description, so make the examples follow the same order.
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-reset.txt | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt index 70198f90c..1550ba255 100644 --- a/Documentation/git-reset.txt +++ b/Documentation/git-reset.txt @@ -86,6 +86,29 @@ OPTIONS EXAMPLES -------- +Undo add:: ++ +------------ +$ edit <1> +$ git add frotz.c filfre.c +$ mailx <2> +$ git reset <3> +$ git pull git://info.example.com/ nitfol <4> +------------ ++ +<1> You are happily working on something, and find the changes +in these files are in good order. You do not want to see them +when you run "git diff", because you plan to work on other files +and changes with these files are distracting. +<2> Somebody asks you to pull, and the changes sounds worthy of merging. +<3> However, you already dirtied the index (i.e. your index does +not match the HEAD commit). But you know the pull you are going +to make does not affect frotz.c nor filfre.c, so you revert the +index changes for these two files. Your changes in working tree +remain there. +<4> Then you can pull and merge, leaving frotz.c and filfre.c +changes still in the working tree. + Undo a commit and redo:: + ------------ @@ -133,29 +156,6 @@ current HEAD. <2> Rewind the master branch to get rid of those three commits. <3> Switch to "topic/wip" branch and keep working. -Undo add:: -+ ------------- -$ edit <1> -$ git add frotz.c filfre.c -$ mailx <2> -$ git reset <3> -$ git pull git://info.example.com/ nitfol <4> ------------- -+ -<1> You are happily working on something, and find the changes -in these files are in good order. You do not want to see them -when you run "git diff", because you plan to work on other files -and changes with these files are distracting. -<2> Somebody asks you to pull, and the changes sounds worthy of merging. -<3> However, you already dirtied the index (i.e. your index does -not match the HEAD commit). But you know the pull you are going -to make does not affect frotz.c nor filfre.c, so you revert the -index changes for these two files. Your changes in working tree -remain there. -<4> Then you can pull and merge, leaving frotz.c and filfre.c -changes still in the working tree. - Undo a merge or pull:: + ------------ |