diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-10-20 05:42:33 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-10-20 05:42:33 +0000 |
| commit | 7d06a8aba96d4197610b089a0862b46d84a36f53 (patch) | |
| tree | 32010c51081107cd4c7b54fb59b212abdd429fcd /git-filter-branch.html | |
| parent | a2deec5920d1cc24a58ea6af6f0f7d36dedd0f7d (diff) | |
| download | git-htmldocs-7d06a8aba96d4197610b089a0862b46d84a36f53.tar.gz | |
Autogenerated HTML docs for v1.6.0.2-588-g3102
Diffstat (limited to 'git-filter-branch.html')
| -rw-r--r-- | git-filter-branch.html | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/git-filter-branch.html b/git-filter-branch.html index 467ed51ea..20dff4a25 100644 --- a/git-filter-branch.html +++ b/git-filter-branch.html @@ -347,7 +347,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.</p></div>
+would suffice to fix your problem. (See the "RECOVERING FROM UPSTREAM
+REBASE" section in <a href="git-rebase.html">git-rebase(1)</a> for further information about
+rewriting published history.)</p></div>
<div class="para"><p>Always verify that the rewritten version is correct: The original refs,
if different from the rewritten ones, will be stored in the namespace
<em>refs/original/</em>.</p></div>
@@ -674,7 +676,7 @@ and the git list <git@vger.kernel.org></p></div> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2008-09-19 06:32:54 UTC
+Last updated 2008-10-20 05:41:59 UTC
</div>
</div>
</body>
|