X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=git-debrebase.1.pod;h=9f82a7c311365bc43b171891d3294cc34be1dfb0;hp=2547a98eecf44f6dbd28414427c63ce0fbffe588;hb=c4ba5f47ca8674d6212dd9e76a4ee4185e815a75;hpb=38d74ac90781b75e2239440c6430db00d909164a diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod index 2547a98e..9f82a7c3 100644 --- a/git-debrebase.1.pod +++ b/git-debrebase.1.pod @@ -55,22 +55,37 @@ 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 prepush [--prose=] + =item git-debrebase stitch [--prose=] -Stitch the branch, +Stitches the branch, consuming ffq-prev. +This is a good command to run before pushing to a git server. If there is no ffq-prev, it is an error, unless --noop-ok. -It is a snag (see B<-f>) if the branch is not laundered. +You should consider using B instead, +because that launders the branch too. =item git-debrebase new-upstream-v0 [...]