summaryrefslogtreecommitdiff
path: root/Documentation/git-filter-branch.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-filter-branch.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-filter-branch.txt')
-rw-r--r--Documentation/git-filter-branch.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/git-filter-branch.txt b/Documentation/git-filter-branch.txt
index b0e710d..fed6de6 100644
--- a/Documentation/git-filter-branch.txt
+++ b/Documentation/git-filter-branch.txt
@@ -36,7 +36,9 @@ the objects and will not converge with the original branch. You will not
be able to easily push and distribute the rewritten branch on top of the
original branch. Please do not use this command if you do not know the
full implications, and avoid using it anyway, if a simple single commit
-would suffice to fix your problem.
+would suffice to fix your problem. (See the "RECOVERING FROM UPSTREAM
+REBASE" section in linkgit:git-rebase[1] for further information about
+rewriting published history.)
Always verify that the rewritten version is correct: The original refs,
if different from the rewritten ones, will be stored in the namespace