[PATCH v2 4/5] Documentation/reset: reorder examples to match description
- From
Thomas Rast <trast@student.ethz.ch>
- Date
- Jul 18, 2010, 18:23 UTC
- Message-ID
- <4d1facbcc99ee13068a00134d01c7f717369d3b9.1279477130.git.trast@student.ethz.ch>
- In-Reply-To
- <cover.1279477130.git.trast@student.ethz.ch>
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> --- 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 70198f9..1550ba2 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:: + ------------
-- 1.7.2.rc3.317.gc287