summaryrefslogtreecommitdiffstats
path: root/git-reset.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2008-10-20 05:42:33 +0000
committerJunio C Hamano <junio@hera.kernel.org>2008-10-20 05:42:33 +0000
commit7d06a8aba96d4197610b089a0862b46d84a36f53 (patch)
tree32010c51081107cd4c7b54fb59b212abdd429fcd /git-reset.txt
parenta2deec5920d1cc24a58ea6af6f0f7d36dedd0f7d (diff)
downloadgit-htmldocs-7d06a8aba96d4197610b089a0862b46d84a36f53.tar.gz
Autogenerated HTML docs for v1.6.0.2-588-g3102
Diffstat (limited to 'git-reset.txt')
-rw-r--r--git-reset.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/git-reset.txt b/git-reset.txt
index 6abaeac28..52aab5e68 100644
--- a/git-reset.txt
+++ b/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::
+