From: Thomas Rast <trast@student.ethz.ch>
To: <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [PATCH v2 4/5] Documentation/reset: reorder examples to match description
Date: Sun, 18 Jul 2010 20:23:25 +0200 [thread overview]
Message-ID: <4d1facbcc99ee13068a00134d01c7f717369d3b9.1279477130.git.trast@student.ethz.ch> (raw)
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
next prev parent reply other threads:[~2010-07-18 18:24 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-16 9:44 [RFC PATCH 0/5] git-reset documentation changes Thomas Rast
2010-07-16 9:44 ` [RFC PATCH 1/5] Documentation/git-reset: reorder modes for soft-mixed-hard progression Thomas Rast
2010-07-16 9:44 ` [RFC PATCH 2/5] Documentation/reset: separate options by mode Thomas Rast
2010-07-16 20:43 ` Junio C Hamano
2010-07-18 18:23 ` [PATCH v2 0/5] git-reset documentation changes Thomas Rast
2010-07-18 18:23 ` [PATCH v2 1/5] Documentation/git-reset: reorder modes for soft-mixed-hard progression Thomas Rast
2010-07-18 18:23 ` [PATCH v2 2/5] Documentation/reset: separate options by mode Thomas Rast
2010-07-18 18:23 ` [PATCH v2 3/5] Documentation/reset: promote 'examples' one section up Thomas Rast
2010-07-18 18:23 ` Thomas Rast [this message]
2010-07-18 18:23 ` [PATCH v2 5/5] Documentation/reset: move "undo permanently" example behind "make topic" Thomas Rast
2010-07-16 9:44 ` [RFC PATCH 3/5] Documentation/reset: promote 'examples' one section up Thomas Rast
2010-07-16 9:44 ` [RFC PATCH 4/5] Documentation/reset: reorder examples to match description Thomas Rast
2010-07-16 9:44 ` [RFC PATCH 5/5] Documentation/reset: move "undo permanently" example behind "make topic" Thomas Rast
2010-07-16 21:00 ` [RFC PATCH 0/5] git-reset documentation changes Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4d1facbcc99ee13068a00134d01c7f717369d3b9.1279477130.git.trast@student.ethz.ch \
--to=trast@student.ethz.ch \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).