path: root/git-debrebase.1.pod
diff options
authorIan Jackson <>2018-07-31 13:16:53 +0100
committerIan Jackson <>2018-07-31 13:16:54 +0100
commitc83cc428208bee99de3b75158b9779449403ee1b (patch)
treed8527b23eed180d768adafdc347c52cd69631107 /git-debrebase.1.pod
parent8b650aeb481a3a4cb71325b6b7255194589c7612 (diff)
git-debrebase: convert-from-gbp: Use same algorithm for finding upstream
The version is in the changelog, and thus upstream commitish can then be found from as new-upstream. This also means we now give the same error message, which is much better than the one we had before. Closes:#905062. Signed-off-by: Ian Jackson <>
Diffstat (limited to 'git-debrebase.1.pod')
1 files changed, 2 insertions, 0 deletions
diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod
index 273ef47..b15bf00 100644
--- a/git-debrebase.1.pod
+++ b/git-debrebase.1.pod
@@ -250,6 +250,8 @@ the gbp upstream branch, if there is one.
It is a snag if it is not an ancestor of HEAD,
or if the history between the upstream and HEAD
contains commits which make changes to upstream files.
+If it is not specified,
+the same algorithm is used as for git-debrebase new-upstream.
It is also a snag if the specified upstream
has a debian/ subdirectory.