X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debrebase.5.pod;h=8209fc19fc7d08ef2e8829d9e9df4b4f03abc128;hb=69323e5f402c84897eaeea7a28cdae1b3da10066;hp=c30b124dea9d7cf254107f32827a17fc9a4e2682;hpb=9e94228f893936a65dea1a05758e523dc7e7d22f;p=dgit.git diff --git a/git-debrebase.5.pod b/git-debrebase.5.pod index c30b124d..8209fc19 100644 --- a/git-debrebase.5.pod +++ b/git-debrebase.5.pod @@ -190,7 +190,7 @@ and the user's work can later be stitched into the fast-forwarding interchange form. -An unstitched branch may be in the +An unstitched branch may be in B state, which means it has a more particular special form @@ -391,7 +391,7 @@ general merges on any of the relevant branches. For this reason the tools will try to help the user avoid divergence of the interchange branch. -See dgit-maint-rebase(7) +See dgit-maint-debrebase(7) for a discussion of what kinds of behaviours should be be avoided because