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: Rename new-upstream-v0 command to new-upstream
[dgit.git]
/
git-debrebase.1.pod
diff --git
a/git-debrebase.1.pod
b/git-debrebase.1.pod
index 4d4c85a94992b7e83f68d5e8a20212176ee658c6..6168e144dc057e50c96c0c5c7f34747d81373f56 100644
(file)
--- a/
git-debrebase.1.pod
+++ b/
git-debrebase.1.pod
@@
-100,7
+100,7
@@
If there is no ffq-prev, it is an error, unless --noop-ok.
You should consider using B<conclude> instead,
because that launders the branch too.
You should consider using B<conclude> instead,
because that launders the branch too.
-=item git-debrebase new-upstream
-v0
<new-version> [<upstream-details>...]
+=item git-debrebase new-upstream <new-version> [<upstream-details>...]
Rebases the delta queue
onto a new upstream version. In detail:
Rebases the delta queue
onto a new upstream version. In detail:
@@
-142,7
+142,10
@@
The <upstream-details> are, optionally, in order:
=item <upstream-commit-ish>
The new upstream branch (or commit-ish).
=item <upstream-commit-ish>
The new upstream branch (or commit-ish).
-Default is C<upstream>.
+The default is to look for one of these tags, in this order:
+U vU upstream/U;
+where U is the new upstream version.
+(This is the same algorithm as L<git-deborig(1)>.)
It is a snag if the upstream contains a debian/ directory;
if forced to proceed,
It is a snag if the upstream contains a debian/ directory;
if forced to proceed,
@@
-196,11
+199,6
@@
L<git-deborig(1)>,
L<git-archive(1)>, L<dgit(1)> and
L<gbp-import-orig(1)> may be able to help.
L<git-archive(1)>, L<dgit(1)> and
L<gbp-import-orig(1)> may be able to help.
-This subcommand has -v0 in its name because we are not yet sure
-that its command line syntax is optimal.
-We may want to introduce an incompatible replacement syntax
-under the name C<new-upstream>.
-
=item git-debrebase make-patches [--quiet-would-amend]
Generate patches in debian/patches/
=item git-debrebase make-patches [--quiet-would-amend]
Generate patches in debian/patches/
@@
-227,6
+225,9
@@
are not a simple superset of those already in debian/patches,
make-patches will fail with exit status 7,
and an error message.
(The message can be suppress with --quiet-would-amend.)
make-patches will fail with exit status 7,
and an error message.
(The message can be suppress with --quiet-would-amend.)
+If the problem is simply that
+the existing patches were not made by git-debrebase,
+using dgit quilt-fixup instead should succeed.
=item git-debrebase convert-from-gbp [<upstream-commit-ish>]
=item git-debrebase convert-from-gbp [<upstream-commit-ish>]