X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=git-debrebase.1.pod;h=ca81c19780a531e5c88215bbbab6f770c61e9560;hp=28f3084816064107440ab23f938091d4079269c1;hb=e66c2cf3f7182a3e6f52945636a807ed4a959d5b;hpb=b58f7c61452fc5b8b7d70f735283ecdc1b5e8ac3 diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod index 28f30848..ca81c197 100644 --- a/git-debrebase.1.pod +++ b/git-debrebase.1.pod @@ -95,22 +95,30 @@ If the branch is already laundered and stitched, does nothing. =item git-debrebase prepush [--prose=] +If the branch is unstitched, +stitches it, +consuming ffq-prev. + +This is a good command to run before pushing to a git server. +You should consider using B instead, +because that launders the branch too. + =item git-debrebase stitch [--prose=] 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. -You should consider using B instead, -because that launders the branch too. +You should consider using B or B instead. =item git-debrebase scrap Throws away all the work since the branch was last stitched. This is done by rewinding you to ffq-prev. +If you are in the middle of a git-rebase, will abort that too. + =item git-debrebase new-upstream [...] Rebases the delta queue