diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-17 13:29:03 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-17 13:29:03 +0100 |
| commit | 1ea98cbf5d01ea6110b2c95b4be941fcfce787a6 (patch) | |
| tree | e2c2500aed4ed491579704888cff58975f711d38 /git-debrebase.1.pod | |
| parent | edc1cd049cfa01e7d6249ea199725d2448858704 (diff) | |
documentation: Discuss gdr make-patches vs dgit quilt-fixup, etc.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase.1.pod')
| -rw-r--r-- | git-debrebase.1.pod | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod index f17f1d6..6a98ed2 100644 --- 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>] |