diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-10-19 16:07:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-10-19 16:07:23 -0700 |
| commit | 310d188f7e1d1fbbeace17d5c62e422fd0b5a824 (patch) | |
| tree | 03b67c95d2c1813e551966fd2526a0e42495e8e9 /Documentation/git-filter-branch.txt | |
| parent | Merge branch 'mv/clonev' (diff) | |
| parent | Documentation: add manpage about workflows (diff) | |
| download | tgif-310d188f7e1d1fbbeace17d5c62e422fd0b5a824.tar.xz | |
Merge branch 'tr/workflow-doc'
* tr/workflow-doc:
Documentation: add manpage about workflows
Documentation: Refer to git-rebase(1) to warn against rewriting
Documentation: new upstream rebase recovery section in git-rebase
Diffstat (limited to 'Documentation/git-filter-branch.txt')
| -rw-r--r-- | Documentation/git-filter-branch.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/git-filter-branch.txt b/Documentation/git-filter-branch.txt index b0e710d5f9..fed6de6a7f 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 |