summaryrefslogtreecommitdiff
path: root/Documentation/git-reset.txt
diff options
context:
space:
mode:
authorThomas Rast <trast@student.ethz.ch>2010-07-18 18:23:26 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-07-19 16:12:42 (GMT)
commit6e90f7b8df5d9557e0204f047f2d47bd89d99588 (patch)
tree7689faabddf3470b7a95be23806b926d6834ab62 /Documentation/git-reset.txt
parent8bb95bbca774506b15a1ca3b7ae233118956e45e (diff)
downloadgit-6e90f7b8df5d9557e0204f047f2d47bd89d99588.zip
git-6e90f7b8df5d9557e0204f047f2d47bd89d99588.tar.gz
git-6e90f7b8df5d9557e0204f047f2d47bd89d99588.tar.bz2
Documentation/reset: move "undo permanently" example behind "make topic"
I consider the latter usage more important. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-reset.txt')
-rw-r--r--Documentation/git-reset.txt26
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::
+
------------