X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debrebase.1.pod;h=5da532029049951d43682eed5671df153e3e75e1;hb=a02cbb3c36fa4dc9b073d9494f7b4cedb54f1f08;hp=73251706a73c1036ee8a00a87ea43db4bb2da11b;hpb=b5bf8a0f318806562b3089ce8a84d864ee2b3f0f;p=dgit.git diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod index 73251706..5da53202 100644 --- a/git-debrebase.1.pod +++ b/git-debrebase.1.pod @@ -84,7 +84,8 @@ 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 [...] @@ -187,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