X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=git-debrebase.1.pod;h=4d4c85a94992b7e83f68d5e8a20212176ee658c6;hp=27b5c9337596e0235957bfbda32f5ad36a4edf07;hb=ca261d36408442d8f3beeac12434af95810b1e32;hpb=2f538edde0ceb8dc747dd481e2e80ab2f36555d7 diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod index 27b5c933..4d4c85a9 100644 --- a/git-debrebase.1.pod +++ b/git-debrebase.1.pod @@ -201,7 +201,7 @@ 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 +=item git-debrebase make-patches [--quiet-would-amend] Generate patches in debian/patches/ representing the changes made to upstream files. @@ -222,6 +222,12 @@ and all that has happened is that more changes to upstream files have been committed, running it again can add the missing patches. +If the patches implied by the current branch +are not a simple superset of those already in debian/patches, +make-patches will fail with exit status 7, +and an error message. +(The message can be suppress with --quiet-would-amend.) + =item git-debrebase convert-from-gbp [] Cnnverts a gbp patches-unapplied branch