X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debrebase.1.pod;h=286d6718dc13db423c63406b84db1166fd0983dc;hb=df9078a9e956ea6be6af328fcdbd2e22331077c1;hp=273ef47dc1c13ee465d59950783a1f495b63763d;hpb=81e93ac2f3ac0b129f0d5e77d055b99053105892;p=dgit.git diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod index 273ef47d..286d6718 100644 --- a/git-debrebase.1.pod +++ b/git-debrebase.1.pod @@ -55,6 +55,12 @@ The options for git-rebase must either start with C<-i>, or be prececded by C<-->, to distinguish them from options for git-debrebase. +It is hazardous to use plain git-rebase on a git-debrebase branch, +because git-rebase has a tendency to start the rebase +too far back in history, +and then drop important commits. +Soo L + =item git-debrebase status Analyses the current branch, @@ -250,6 +256,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.