Merge branch 'gdr-manpages' into wip.rebase

[dgit.git] / git-debrebase.1.pod

diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod
index f17f1d670e3f5ffb529ecb5fa228f2109bcbab87..6a98ed2d7bbceb1157c2c86a8b3b1e307bc55ba1 100644 (file)
--- a/git-debrebase.1.pod
+++ b/git-debrebase.1.pod
@@ -230,6 +230,9 @@ 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.)
+If the problem is simply that
+the existing patches were not made by git-debrebase,
+using dgit quilt-fixup instead should succeed.
 
 =item git-debrebase convert-from-gbp [<upstream-commit-ish>]