X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debrebase.1.pod;h=bdec02f6b2669a8ae0481da3790b7bf1c263c7f3;hb=17ffe84e1d4c3dcae3dfc6edb8369d913b4dd80b;hp=8f092c8ce360a15b52133dcd757b79ae89134992;hpb=f58777f379b8fea92d8ae4f80c1bba3299d951b3;p=dgit.git diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod index 8f092c8c..bdec02f6 100644 --- a/git-debrebase.1.pod +++ b/git-debrebase.1.pod @@ -29,10 +29,13 @@ which defines many important terms used here. =item git-debrebase [-- ] +=item git-debrebase [-i ] + Unstitches and launders the branch. (See L below.) -Then optionally edits the Debian delta queue, +Then, if any git-rebase options were supplied, +edits the Debian delta queue, using git-rebase, by running git rebase @@ -48,6 +51,10 @@ If you abort the git-rebase, the branch will still have been laundered, but everything in the rebase will be undone. +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 Launder and restitch the branch,