diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-11-08 00:47:09 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-11-08 00:47:09 +0000 |
commit | b7f48e640bca6c2542c206c9bb7cdab182ba0a2c (patch) | |
tree | 8295d562987a359953521c63f59521d1f33f75fc /dgit-maint-debrebase.7.pod | |
parent | 737e066cf48706a00da9d65d0ee026fef0771a8b (diff) |
dgit-maint-debrebase(7): Minor corrections to #903377 wording
Do not suggest trying without --overwrite first, since if you were
going to pass it anyway you may as well do so right away.
And mention that git-debrebase will normally prompt you to say
dgit --overwrite.
Closes: #903377
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit-maint-debrebase.7.pod')
-rw-r--r-- | dgit-maint-debrebase.7.pod | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dgit-maint-debrebase.7.pod b/dgit-maint-debrebase.7.pod index e3d557a..f167928 100644 --- a/dgit-maint-debrebase.7.pod +++ b/dgit-maint-debrebase.7.pod @@ -450,8 +450,8 @@ I<--new> if the package is new in the target suite. In some cases where you used B<git debrebase convert-from-gbp> since the last upload, it is not possible for dgit to make your history fast-forwarding from the history on B<dgit-repos>. In such cases you -will require I<--overwrite>. Try pushing without this option first, -and then dgit will suggest using it if it is needed. +will have to pass I<--overwrite> to dgit. git-debrebase will normally +tell you if this is will be needed. Right before uploading, if you did not just already do so, you might want to have git-debrebase(1) shuffle your branch such that the Debian |