X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debrebase.1.pod;h=3e4c69845598fb59e97b0d489bdcb4d33e559004;hb=8b875c05ff728c9335f692ccc21c5abfe2203d26;hp=556a44223d6673c862d81cff7aa66bf91f82494f;hpb=7f542a225923b6cb8cfd7d744bdc86293e97fdab;p=dgit.git diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod index 556a4422..3e4c6984 100644 --- a/git-debrebase.1.pod +++ b/git-debrebase.1.pod @@ -55,14 +55,24 @@ The options for git-rebase must either start with C<-i>, or be prececded by C<-->, to distinguish them from options for git-debrebase. +=item git-debrebase conclude + +Finishes a git-debrebase session, +tidying up the branch and making it fast forward again. + +Specifically: if the branch is unstitched, +launders and restitches it, +making a new pseudomerge. +Otherwise, it is an error, +unless --noop-ok. + =item git-debrebase quick Unconditionally launders and restitches the branch, consuming any ffq-prev and making a new pseudomerge. -If the branch is already laundered and stitched, it is an error, -unless --noop-ok. +If the branch is already laundered and stitched, does nothing. =item git-debrebase stitch [--prose=]