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=2547a98eecf44f6dbd28414427c63ce0fbffe588;hpb=38d74ac90781b75e2239440c6430db00d909164a;p=dgit.git diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod index 2547a98e..3e4c6984 100644 --- a/git-debrebase.1.pod +++ b/git-debrebase.1.pod @@ -55,17 +55,28 @@ 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 quick +=item git-debrebase conclude -Launder and restitch the branch, -consuming any ffq-prev. +Finishes a git-debrebase session, +tidying up the branch and making it fast forward again. -If the branch is already laundered and stitched, it is an error, +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, does nothing. + =item git-debrebase stitch [--prose=] -Stitch the branch, +Stitches the branch, consuming ffq-prev. If there is no ffq-prev, it is an error, unless --noop-ok.