mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
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>
This commit is contained in:
parent
8bb95bbca7
commit
6e90f7b8df
|
@ -128,19 +128,6 @@ edit the message further, you can give -C option instead.
|
||||||
+
|
+
|
||||||
See also the --amend option to linkgit:git-commit[1].
|
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::
|
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.
|
<2> Rewind the master branch to get rid of those three commits.
|
||||||
<3> Switch to "topic/wip" branch and keep working.
|
<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::
|
Undo a merge or pull::
|
||||||
+
|
+
|
||||||
------------
|
------------
|
||||||
|
|
Loading…
Reference in a new issue