chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-debrebase(1): Fix typo "unappled".
[dgit.git]
/
git-debrebase.1.pod
diff --git
a/git-debrebase.1.pod
b/git-debrebase.1.pod
index d67e5570452d699851564860cc1a2e980d6ef718..db22fa5d5023baad3e6ec5198de6913e53ce8eba 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.
@@
-265,8
+273,12
@@
your new git-debrebase view is appropriately fast forward.
The result is a well-formed git-debrebase interchange branch.
The result is also fast-forward from the gbp branch.
The result is a well-formed git-debrebase interchange branch.
The result is also fast-forward from the gbp branch.
+It is a snag if the new branch looks like it will have diverged,
+just as for a laundering/unstitching call to git-debrebase;
+See L</Establish the current branch's ffq-prev>, below.
+
Note that it is dangerous not to know whether you are
Note that it is dangerous not to know whether you are
-dealing with a gbp patches-unappled branch containing quilt patches,
+dealing with a gbp patches-unappl
i
ed branch containing quilt patches,
or a git-debrebase interchange branch.
At worst,
using the wrong tool for the branch format might result in
or a git-debrebase interchange branch.
At worst,
using the wrong tool for the branch format might result in