X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=git-debrebase.1.pod;h=b15bf00c1c88f233fa569f38a693e0cca4d5523d;hp=273ef47dc1c13ee465d59950783a1f495b63763d;hb=c83cc428208bee99de3b75158b9779449403ee1b;hpb=8b650aeb481a3a4cb71325b6b7255194589c7612 diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod index 273ef47d..b15bf00c 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.