git-debrebase: make-patched: Provide --quiet-would-amend

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

diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod
index 27b5c9337596e0235957bfbda32f5ad36a4edf07..4d4c85a94992b7e83f68d5e8a20212176ee658c6 100644 (file)
--- 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<new-upstream>.
 
-=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 [<upstream-commit-ish>]
 
 Cnnverts a gbp patches-unapplied branch