summaryrefslogtreecommitdiff
path: root/Documentation/git-reset.txt
diff options
context:
space:
mode:
authorThomas Rast <trast@student.ethz.ch>2008-09-13 16:11:01 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-09-16 04:22:58 (GMT)
commit97c33c658365e0467e931bb8fed67d4f2a8d26f1 (patch)
tree2330a4a9656828184fd29b975410d2ee9f5a612c /Documentation/git-reset.txt
parent90d1c08efcf9c688df207588d9b72178524a62b6 (diff)
downloadgit-97c33c658365e0467e931bb8fed67d4f2a8d26f1.zip
git-97c33c658365e0467e931bb8fed67d4f2a8d26f1.tar.gz
git-97c33c658365e0467e931bb8fed67d4f2a8d26f1.tar.bz2
Documentation: Refer to git-rebase(1) to warn against rewriting
This points readers at the "Recovering from upstream rebase" warning in git-rebase(1) when we talk about rewriting published history in the 'reset', 'commit --amend', and 'filter-branch' documentation. 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.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt
index 6abaeac..52aab5e 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::
+