From: Thomas Rast <trast@student.ethz.ch>
To: <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [PATCH v2 5/5] Documentation/reset: move "undo permanently" example behind "make topic"
Date: Sun, 18 Jul 2010 20:23:26 +0200 [thread overview]
Message-ID: <81de753d1130b2e29151d67494926656af3e0cee.1279477130.git.trast@student.ethz.ch> (raw)
In-Reply-To: <cover.1279477130.git.trast@student.ethz.ch>
I consider the latter usage more important.
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
---
Documentation/git-reset.txt | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt
index 1550ba2..b04d129 100644
--- a/Documentation/git-reset.txt
+++ b/Documentation/git-reset.txt
@@ -128,19 +128,6 @@ edit the message further, you can give -C option instead.
+
See also the --amend option to linkgit:git-commit[1].
-Undo commits permanently::
-+
-------------
-$ git commit ...
-$ git reset --hard HEAD~3 <1>
-------------
-+
-<1> The last three commits (HEAD, HEAD^, and HEAD~2) were bad
-and you do not want to ever see them again. Do *not* do this if
-you have already given these commits to somebody else. (See the
-"RECOVERING FROM UPSTREAM REBASE" section in linkgit:git-rebase[1] for
-the implications of doing so.)
-
Undo a commit, making it a topic branch::
+
------------
@@ -156,6 +143,19 @@ current HEAD.
<2> Rewind the master branch to get rid of those three commits.
<3> Switch to "topic/wip" branch and keep working.
+Undo commits permanently::
++
+------------
+$ git commit ...
+$ git reset --hard HEAD~3 <1>
+------------
++
+<1> The last three commits (HEAD, HEAD^, and HEAD~2) were bad
+and you do not want to ever see them again. Do *not* do this if
+you have already given these commits to somebody else. (See the
+"RECOVERING FROM UPSTREAM REBASE" section in linkgit:git-rebase[1] for
+the implications of doing so.)
+
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 ` [PATCH v2 4/5] Documentation/reset: reorder examples to match description Thomas Rast
2010-07-18 18:23 ` Thomas Rast [this message]
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=81de753d1130b2e29151d67494926656af3e0cee.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).