chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changelog: finalise 6.3
[dgit.git]
/
git-debrebase.1.pod
diff --git
a/git-debrebase.1.pod
b/git-debrebase.1.pod
index 273ef47dc1c13ee465d59950783a1f495b63763d..286d6718dc13db423c63406b84db1166fd0983dc 100644
(file)
--- 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.
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<git-debrebase(5)/ILLEGAL OPERATIONS>
+
=item git-debrebase status
Analyses the current branch,
=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.
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.
It is also a snag if the specified upstream
has a debian/ subdirectory.