X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=git-debrebase.1.pod;h=5da532029049951d43682eed5671df153e3e75e1;hp=3e4c69845598fb59e97b0d489bdcb4d33e559004;hb=bc95a2402f9e765113ef38d12d642a3340132049;hpb=8b875c05ff728c9335f692ccc21c5abfe2203d26 diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod index 3e4c6984..5da53202 100644 --- a/git-debrebase.1.pod +++ b/git-debrebase.1.pod @@ -74,14 +74,18 @@ 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=] 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 [...] @@ -184,6 +188,27 @@ that its command line syntax is optimal. We may want to introduce an incompatible replacement syntax under the name C. +=item git-debrebase make-patches + +Generate patches in debian/patches/ +representing the changes made to upstream files. + +It is not normally necessary to run this command explicitly. +When uploading to Debian, +dgit and git-debrebase +will cooperate to regenerate patches as necessary. +When working with pure git remotes, +the patches are not needed. + +Normally git-debrebase make-patches will +require a laundered branch. +(A laundered branch does not contain any patches.) +But if there are already some patches made by +git-debrebase make-patches, +and all that has happened is that more +changes to upstream files have been committed, +running it again can add the missing patches. + =item git-debrebase convert-from-gbp [] Cnnverts a gbp patches-unapplied branch