chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dgit: Non-noop git fetch is not available with --dry-run, so fail
[dgit.git]
/
git-debrebase.1.pod
diff --git
a/git-debrebase.1.pod
b/git-debrebase.1.pod
index 6a98ed2d7bbceb1157c2c86a8b3b1e307bc55ba1..1c3e68128f0e4967e90d1bb9e219b43b075e57a9 100644
(file)
--- a/
git-debrebase.1.pod
+++ b/
git-debrebase.1.pod
@@
-15,11
+15,11
@@
Debian packages based on upstream source code.
This is the command line reference.
Please read the tutorial
This is the command line reference.
Please read the tutorial
-L<dgit-maint-debrebase(
5
)>.
+L<dgit-maint-debrebase(
7
)>.
For background, theory of operation,
and definitions see L<git-debrebase(5)>.
For background, theory of operation,
and definitions see L<git-debrebase(5)>.
-You should read this manpage in co
nj
unction with
+You should read this manpage in co
jn
unction with
L<git-debrebase(5)/TERMINOLOGY>,
which defines many important terms used here.
L<git-debrebase(5)/TERMINOLOGY>,
which defines many important terms used here.
@@
-57,10
+57,10
@@
to distinguish them from options for git-debrebase.
=item git-debrebase status
=item git-debrebase status
-Analy
ise
the current branch,
-both in terms of its conents,
+Analy
ses
the current branch,
+both in terms of its con
t
ents,
and the refs which are relevant to git-debrebase,
and the refs which are relevant to git-debrebase,
-and print a human-readable summary.
+and print
s
a human-readable summary.
Please do not attempt to parse the output;
it may be reformatted or reorganised in the future.
Please do not attempt to parse the output;
it may be reformatted or reorganised in the future.
@@
-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:
@@
-199,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/
@@
-348,7
+343,7
@@
Turns snag(s) with id <snag-id> into warnings.
Some troublesome things which git-debrebase encounters
are B<snag>s.
(The specific instances are discussed
Some troublesome things which git-debrebase encounters
are B<snag>s.
(The specific instances are discussed
-in the text for the relvant operation.)
+in the text for the rel
e
vant operation.)
When a snag is detected,
a message is printed to stderr containing the snag id
When a snag is detected,
a message is printed to stderr containing the snag id