X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-reset.txt;h=52aab5e68002cbc2f132f57997ecbeb48de998c3;hb=29b802aae6213d02879d21aabac1a8d2e035b583;hp=c8d175768cc665533517952fc613279b42e47f18;hpb=547905f8cd2a04b3e1117f00025b60f81aa60f47;p=git.git diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt index c8d175768..52aab5e68 100644 --- a/Documentation/git-reset.txt +++ b/Documentation/git-reset.txt @@ -82,7 +82,9 @@ $ 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. +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:: + @@ -195,7 +197,7 @@ $ git add frotz.c <3> Author ------ -Written by Junio C Hamano and Linus Torvalds +Written by Junio C Hamano and Linus Torvalds Documentation --------------