summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2021-09-07 23:47:33 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2021-09-08 00:26:14 +0100
commitdcf2388556ddf73c691b02cecdcec57514639c2b (patch)
tree081c328468cfd147e9a95151fbdfaf0d2b28e288
parent14dcd859e2d34b97b66bf16e0f65610ee1b1854a (diff)
git-debrebase(1): Clarify -fanchor-treated snag
Closes: #977426 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rw-r--r--git-debrebase.1.pod5
1 files changed, 4 insertions, 1 deletions
diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod
index 639b07d..17e750a 100644
--- a/git-debrebase.1.pod
+++ b/git-debrebase.1.pod
@@ -532,9 +532,12 @@ commits as anchors, pseudomerges, delta queue commits, etc.
It also disables some coherency checks
which depend on metadata extracted from its commit message,
so
-it is a snag if <commit-ish> is the anchor
+it is a snag (C<-fanchor-treated>) if <commit-ish> is the anchor
for the previous upstream version in
git-debrebase new-upstream operations.
+You have to check yourself that the new upstream
+is fast forward from the old one,
+and has the right components (as if applicable).
=item --dgit=<program>