diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 21:27:36 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-17 11:51:00 +0100 |
commit | ca261d36408442d8f3beeac12434af95810b1e32 (patch) | |
tree | 3b2a204daa04e4aa4b8d11a73dd665973c7371cc /git-debrebase.1.pod | |
parent | 2f538edde0ceb8dc747dd481e2e80ab2f36555d7 (diff) |
git-debrebase: make-patched: Provide --quiet-would-amend
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase.1.pod')
-rw-r--r-- | git-debrebase.1.pod | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod index 27b5c93..4d4c85a 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<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 |