From: Thomas Rast Date: Sun, 18 Jul 2010 18:23:26 +0000 (+0200) Subject: Documentation/reset: move "undo permanently" example behind "make topic" X-Git-Tag: v1.7.2.3~25^2 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6e90f7b8df5d9557e0204f047f2d47bd89d99588;p=git.git Documentation/reset: move "undo permanently" example behind "make topic" I consider the latter usage more important. Signed-off-by: Thomas Rast Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt index 1550ba255..b04d129b3 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:: + ------------